Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 7 May 2008 07:25:45 +0000 (09:25 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 7 May 2008 07:25:45 +0000 (09:25 +0200)
commit09dc2da8613ace509af3f9a70889de55443ee0d8
treef5acd2b146ed73740cbc6032151533bd8cc653ac
parent95cd01af73fdc962e2e0d60e35d03d5d6c2b5429
parent8be6e7d7fb6426e517c9e77045ebe4797d8fe57f
Merge branch 'master' of fettunta.org:/home/zack/git/homepage