Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 23 Jan 2011 09:24:27 +0000 (10:24 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 23 Jan 2011 09:24:27 +0000 (10:24 +0100)
commit8ee9dc0b617e84b694627d700788e35c6050473e
tree00998d382a0f50139b578118a77fe6a515aa0d3a
parent78ea34dcec4f747e816c816ab931be1e7b0d3bf9
parent4213a11e9127dc9110ed3c5c2d40c36449efed7e
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage