Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 14 Mar 2012 12:51:52 +0000 (13:51 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 14 Mar 2012 12:51:52 +0000 (13:51 +0100)
commit790a63c150122b7653f065fc9058392023654987
tree85f2ca55ba3df61fda7fd1c338ab92c5d5c68b90
parentbf799fae35f7499a3469d04d843b78575668ae2c
parent554bd5334b1d32cf92c2b428103e04498ef152d5
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage