Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Fri, 15 Feb 2008 18:56:56 +0000 (19:56 +0100)
committerStefano Zacchiroli <zack@debian.org>
Fri, 15 Feb 2008 18:56:56 +0000 (19:56 +0100)
commitbabc4bd45ba632bf0b0ad68f606b18b40f665aa8
treec2b8192d28b3c658671c56efac4e705b28edfdca
parentdfaf09dcba7f739eac13e287a6d85214c1710620
parent149bf7c77eaf41063afecbc31204299bedf41d35
Merge branch 'master' of fettunta.org:/home/zack/git/homepage