Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 15 May 2008 19:55:23 +0000 (21:55 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 15 May 2008 19:55:23 +0000 (21:55 +0200)
commit31b2ed824b6110cb4b8232e3cc8854e466032245
treee360f1c369126fb7d4ef0389dee023b39ad5fb3f
parentc507792e11d9b302c5db2eacdc440c2d15cc2083
parent9bbae6ceaf8fe50c6c7e5af35c1622aa58a52263
Merge branch 'master' of fettunta.org:/home/zack/git/homepage