Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 10 May 2010 20:38:36 +0000 (22:38 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 10 May 2010 20:38:36 +0000 (22:38 +0200)
commit068a5c657a9610893aa1525d257a7c2802969981
treee205ff5f420368c4aa7537dfd35dc8e54ef28089
parent19257ae04e1b192c492bf71f546ce2fca9eb6ff6
parent56d49896882c07568e9f1b60f24ee83f30d37dfe
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage