Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 30 Jun 2008 15:31:01 +0000 (17:31 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 30 Jun 2008 15:31:01 +0000 (17:31 +0200)
commit9f66f2a7368d04bbf3252f4a879b15f53cac3c01
treed8000ec8c1377b0831c1258acdaf68dfc274e936
parenteb332b591170abf7c07f7f23b90d3e53e4d4a665
parent73fc71408234020c5a10ffbc5477b1d4a122820b
Merge branch 'master' of fettunta.org:/home/zack/git/homepage