Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 28 Dec 2008 20:12:11 +0000 (15:12 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 28 Dec 2008 20:12:11 +0000 (15:12 -0500)
commit17b2afe721d5b8fd2468fca56e91fe83bf49be64
tree3bcac2926d96743b98dfef87baf336247447b71e
parent25879952b1359bcd62dba33f2364c77442358832
parent82d94d4d4a8768e4d741bd37fc3b805260f775b1
Merge branch 'master' into next

Conflicts:

debian/changelog
po/ikiwiki.pot
debian/changelog
po/ikiwiki.pot