Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 12 Oct 2010 07:16:14 +0000 (09:16 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 12 Oct 2010 07:16:14 +0000 (09:16 +0200)
commit7c6686ceb1c5700c25db9ccab9223d516f8f83e5
treeb80a03e4874e47d7161f1edaeac48d7db28e65a6
parentacb8cd76d96d26e0956f3848656ff52f45f3d6be
parent088129b37ab39070db3d3f4ff4c4676966ea12f0
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage