Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 29 Jun 2010 12:51:25 +0000 (14:51 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 29 Jun 2010 12:51:25 +0000 (14:51 +0200)
commit00a020fd9e3a2540b0be034d515d713d066241a8
treeea7c5d89d207956e45aea829fc8457bcad8b06c7
parent1e5b49f2aab21b835850059e89043ec076485e99
parentc9b5a6d6aaefc4306efa92b97865e47c0f54599c
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage