Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 16 Jul 2008 13:43:04 +0000 (15:43 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 16 Jul 2008 13:43:04 +0000 (15:43 +0200)
commit057c74b689de5cb5767ce1ae979b7aaac26ace6e
tree70a637e79ea4d8344f4347c7f9a2e276a943fcc3
parenta0cd400ccff365c409dbf766ca77c5c42631d024
parentc6995bf0c97e665367f0c75c7402d30965422856
Merge branch 'master' of fettunta.org:/home/zack/git/homepage