Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 23 Nov 2009 08:17:58 +0000 (09:17 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 23 Nov 2009 08:17:58 +0000 (09:17 +0100)
commit94c6a38f8225c1effc688c6cc06cc19896f46606
tree17e7f1d317765aa149ae2008c8ec1c6813674651
parent02d2aa36f9e31fd29b280cec2607f91355d18302
parent12db2377800ea521f8626a811b7bc7fb5d7eb9de
Merge branch 'master' of fettunta.org:/home/zack/git/homepage