From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 22 Jan 2012 16:18:07 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Tag: 3.20120202~26^2~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a64b224f524bcef95fc3befeb3e66a854f9e3bff?hp=ad0e56cdcaaf76bc68d1b5c56e6845307b51c44a

Merge branch 'master' into cvs
---

diff --git a/.gitignore b/.gitignore
index fe1c3d441..da2f4eb46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ po/underlays/directives/ikiwiki/directive/*.mdwn
 po/underlays_copy_stamp
 underlays/locale
 /t/tmp/
+doc/bugs/Pages_with_non-ascii_characters_like_*