Merge branch 'master' into po
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 19 May 2009 17:07:47 +0000 (13:07 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 19 May 2009 17:07:47 +0000 (13:07 -0400)
commitef003f48f4a3fe8fb67fda62c70a299b07d75976
treecb5972026e6beed91b5eca2fa4962790244062bd
parent53b1c6f559c1d09fbdbc28c8e4d5090dd455cd26
parent4c5987d150b26f638494638f7861fb7646542a37
Merge branch 'master' into po

Conflicts:
debian/changelog
IkiWiki.pm
IkiWiki/Plugin/blogspam.pm
debian/changelog
debian/control
doc/plugins/write.mdwn