Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 29 Jun 2011 15:10:28 +0000 (17:10 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 29 Jun 2011 15:10:28 +0000 (17:10 +0200)
commit823763b30bad8d0c5dec7bffa61b21b3d3a6bd72
tree209ad3ad86fb47c3214f8de1a1e6f5126099c2b3
parentf9e9e6bc2305882300a95992d8c7437a0641e3f2
parentc6a67eda63750229bab2e6e0cf430c939ecfdb92
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage