Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Thu, 24 Jan 2008 09:35:37 +0000 (10:35 +0100)
committerStefano Zacchiroli <zack@debian.org>
Thu, 24 Jan 2008 09:35:37 +0000 (10:35 +0100)
commitb7d1a2d4e44207d234061f73048600205f6d3994
treef5759d55ceee41f0d68fff0f001b48e8cf4abb6e
parent90f7d97aa94df28019e07752323a7d861c04e202
parent6d9e8e1561f6f15144fecdc75547d0a26b32160d
Merge branch 'master' of fettunta.org:/home/zack/git/homepage