Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 21 May 2010 08:42:41 +0000 (10:42 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 21 May 2010 08:42:41 +0000 (10:42 +0200)
commit3281e9b85af01c325f1151e1a85c9a69120afd55
treeb81b83b091dd81821a220541ef16b8673af75037
parenta8f296ce4368e10168f42165204336b26cb07552
parent3406b03cc414fb59c2c103648315f148abe0ec43
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage