Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 27 Feb 2010 14:15:01 +0000 (15:15 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 27 Feb 2010 14:15:01 +0000 (15:15 +0100)
commitf304e3da949ef67af27a783b551a59f3c27ae891
treec12325369a53904efd24910f1aad464a1bd3054b
parentc7dfb00fdb63767c598681fdffb83fd0417b1864
parent5b3593cef8d40440eb735a72b865c28ac9eb7346
Merge branch 'master' of fettunta.org:/home/zack/git/homepage