From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 23 Jul 2008 19:00:07 +0000 (-0400)
Subject: Merge branch 'master' into tova
X-Git-Tag: 2.55~61
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/335a6a59e66ee7c2cf0c68c659259b885f7e8a07

Merge branch 'master' into tova
---

335a6a59e66ee7c2cf0c68c659259b885f7e8a07
diff --cc debian/changelog
index 57a36eeec,c699f698b..a0d526f88
--- a/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