Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 15 Nov 2008 11:30:51 +0000 (12:30 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 15 Nov 2008 11:30:51 +0000 (12:30 +0100)
commit22be1e5f8fd82e27ae8ebf2ff6dee67d5d71c5a2
treee441af57ddabc99a5416a30f3ef1dc8bb729ef13
parent0badcc67ad68457bae7c0dbe893c7ee82b86f4e0
parentdb354aff46c09ef8b6c80bdddd33ef857c915e40
Merge branch 'master' of fettunta.org:/home/zack/git/homepage