Merge branch 'master' into tova

diff --cc debian/changelog
index a0d526f8819adc9cad2d617540e871bb5d05d485,2b216ca95a70e35c2546c166290d4884e39a8bc6..cfe1688255b0b722d8f3cf945347c36326c38087
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -17,11 -11,8 +17,12 @@@ ikiwiki (2.55) UNRELEASED; urgency=lo
    * Add allow_symlinks_before_srcdir config setting that can be used to avoid
      a security check that is a good safe default, but problimatic overkill in
      some situations.
 +  * Don't allow uploading an attachment with the same name as an existing
 +    page, to avoid confusion.
 +  * Split out error messages from editpage.tmpl into several separate
 +    templates.
    * attachment: Do not escape _ when determining attachment filenames.
+   * Rebuild pages that change their type. (Gabriel McManus)
  
   -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400