Merge branch 'master' into tova

diff --cc IkiWiki/Plugin/attachment.pm
Simple merge

diff --cc debian/changelog
index 57a36eeeca5709b3e006e86bc77c65eee607d40e,c699f698b5a300a358049182822e8412f49f3761..a0d526f8819adc9cad2d617540e871bb5d05d485
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -17,10 -11,7 +17,11 @@@ 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.
  
   -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400