Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 17 Dec 2008 22:27:47 +0000 (23:27 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 17 Dec 2008 22:27:47 +0000 (23:27 +0100)
commit303a33b0f71e0631f1250abd8e60d71d138a6853
tree451e5d0b45160b51e1380eff5627d918862b30c1
parent8cf13f786a5eef2ad795f1f499dd5ca342ed6f6b
parent57a4f5b5927756a7ca57bda2839beffd9b407879
Merge branch 'master' of fettunta.org:/home/zack/git/homepage