Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 20 Dec 2010 09:28:32 +0000 (10:28 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 20 Dec 2010 09:28:32 +0000 (10:28 +0100)
commit5970974b10ba556105144669efedd8b2ccd6794f
treed22f7b96a4ccb9ebeba8753a2a7a40f1a25160dd
parent2bbcfce3c306cb780e8e78e12e1abd10bcef236c
parent55a9efebcff214132fdd418a0d0bb8f763e56e2b
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage