Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 8 May 2010 11:20:26 +0000 (13:20 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 8 May 2010 11:20:26 +0000 (13:20 +0200)
commitf95bae994b788700f5f9f0f9dee53c30dd6cd56a
treeb0858038dfceecd9f8dbf58de84e7240d4455892
parentf053ef935e3ef7132dbea22a903803db4a522adc
parent073840517733ad38f4155c93d9b9e46ab8085ced
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage