Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 16 Jul 2008 13:47:50 +0000 (15:47 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 16 Jul 2008 13:47:50 +0000 (15:47 +0200)
commit5814e1d71cc3cd5a5728c5fbc6dfcd4a55a846d9
treef1320d0cd66f9ab35e2b3e3cfe1e1c7bf0972cab
parent057c74b689de5cb5767ce1ae979b7aaac26ace6e
parent1dbfbe3fb1995d33bb20503bf78b076b51bf9277
Merge branch 'master' of fettunta.org:/home/zack/git/homepage