Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 25 Dec 2008 21:36:16 +0000 (16:36 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 25 Dec 2008 21:36:16 +0000 (16:36 -0500)
commit914c839ceb02fdbb36a49aa6548dc95beaf59ea4
tree3437581c097a77ed839a13ef71e65a4d05cc415e
parent5f55ee0b783fb0a7b3b1dcb63ff280bad25af364
parent0d406010ff8ffb8d891318bbaf6b6de1e2cb2578
Merge branch 'master' into next

Conflicts:

IkiWiki/Plugin/googlecalendar.pm
IkiWiki/Plugin/camelcase.pm
debian/changelog