Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 28 Sep 2010 09:25:30 +0000 (11:25 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 28 Sep 2010 09:25:30 +0000 (11:25 +0200)
commit195a3e4cc0334f794a58b7fefcfb49d313d9232d
tree17e37544a7eaf8dc3fa6543a174bb93b26fea91b
parent2650229e603e716e75b931431c9ce7616c48cd85
parenta4fbfa7fdb53e10d89297e986f184ea2c2c1104c
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage