Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 10 Dec 2008 16:58:59 +0000 (17:58 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 10 Dec 2008 16:58:59 +0000 (17:58 +0100)
commit11831551994cd8231732c93f4bda6b0e2be0a355
tree501bb7ccbb230679d2955b68c031612cda70e083
parent20ea4edd0ce23aa8dd496db574c9940a9df3f374
parent26dc9a6376443cf95c2194835692172e53eae74d
Merge branch 'master' of fettunta.org:/home/zack/git/homepage