Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 16 Feb 2012 10:58:45 +0000 (11:58 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 16 Feb 2012 10:58:45 +0000 (11:58 +0100)
commitfba316d0f11455ad606caeef1dbf7f8ddbf09dcf
treefffce7047a5987ef5ff67faa02647e90e0a1b457
parent43be757677af37a17099203a8943060c7d614b90
parentc1ad7c79b654ca3a4ab087c9968ed45e34958fad
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage