Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 9 Aug 2008 17:07:13 +0000 (14:07 -0300)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 9 Aug 2008 17:07:13 +0000 (14:07 -0300)
commitb5257d9310591e50976e15e9a5415bb395b88f6b
treecdc85dfbabcc26d6cce92d3c1e5ad9710a66b3cd
parentf90622379d35afc5e292393e2d86e69e6b5b7536
parent98d5db178fbf48617711591d5997a05e76fedcb9
Merge branch 'master' of fettunta.org:/home/zack/git/homepage