Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 1 Dec 2010 11:08:19 +0000 (12:08 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 1 Dec 2010 11:08:19 +0000 (12:08 +0100)
commitfbc393fdc265e1657fef1e1083cadb223f7a410e
tree71aa1a0df8d54713d31eaf6ccc1b8cb8b4c9feb2
parent8858ab9c18f93c73960737d13bf4be72358c8579
parent4a0478e38db99b3f10da324e7058ad6841a74f2f
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage