Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 2 Nov 2008 21:36:22 +0000 (22:36 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 2 Nov 2008 21:36:22 +0000 (22:36 +0100)
commit20560ffed0383fcf0170bce3b1d1251550d57d9f
tree96f2c47051079d2bcc344cd8f9774ef8c5e07019
parentd67ca5531ba8acafaa56cbd468e1ca3b9774030f
parent7db945447f9d2347d18e3a1510926aa865e97dd1
Merge branch 'master' of fettunta.org:/home/zack/git/homepage