Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Mon, 4 Feb 2008 18:06:44 +0000 (19:06 +0100)
committerStefano Zacchiroli <zack@debian.org>
Mon, 4 Feb 2008 18:06:44 +0000 (19:06 +0100)
commita907d1efbd6cb55a539cb489e4a401181f5bb0c2
treec11dce3f743fca200926cf5f08fce929944fc14f
parentda9e812ceccc1ca92d43cb311986fb0f49843baf
parentcf1e01042c7af6e99146da76f169bf6a12d73186
Merge branch 'master' of fettunta.org:/home/zack/git/homepage