Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 30 Sep 2010 07:31:51 +0000 (09:31 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 30 Sep 2010 07:31:51 +0000 (09:31 +0200)
commit599d9ad81938577eb52eab372f16d4b0f681c12f
tree05d57947ad1803fb727e2d6bdb0ff392290922a9
parent974d312e1472859da814184c11d3c9282bfd25b1
parentcdde9da7543f9de862a4b0604faaaf223d72683f
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage