Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 12 Nov 2012 13:05:14 +0000 (14:05 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 12 Nov 2012 13:05:14 +0000 (14:05 +0100)
commit1307d9e9aee17d035d347fb8b3d22067a28e0254
treefac65d39000a1500ca6df8ca8954eab2a1274008
parentd9271bb1e7058c7ca1fc5e9f273e41f843d154c4
parentc101cddfc41a5139a6bc592c9cabdc9bc487427a
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage