Merge commit 'upstream/master' into pub/po

Conflicts:

	debian/changelog
	debian/control

Signed-off-by: intrigeri <intrigeri@boum.org>

diff --cc IkiWiki.pm
Simple merge

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

diff --cc debian/changelog
index 4e1aa854598fba25d699eca391e0463f39d54e79,7f82578130ff93b632f4a2a4ca3b6f94097f6ff8..d72efe455c1bc0071d8f9a5b4817b345c13a2c62
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,43 +1,47 @@@
- ikiwiki (3.14) UNRELEASED; urgency=low
+ ikiwiki (3.15) UNRELEASED; urgency=low
  
+   * comment: Make comment directives no longer use the internal "_comment"
+     form, and document the comment directive syntax.
+   * Avoid relying on translators preserving the case when translating
+     "discussion", which caused Discussion pages to get unwanted Discussion
+     links.
+   * Tighten up matching of bare words inside directives; do not
+     allow an unterminated """ string to be treated as a series
+     of bare words. Fixes runaway regexp recursion/backtracking
+     in strange situations.
+   * Setup automator: Check that each plugin added to the generated
+     setup file can be loaded and that its config is ok. If a plugin
+     fails for any reason, disable it in the generated file.
+     Closes: 532001
+   * pagecount: Fix broken optimisation for * pagespec.
+   * goto: Support being passed a page title that is not a valid page
+     name, to support several cases including mercurial's long user
+     names on the RecentChanges page, and urls with spaces being handled
+     by the 404 plugin.
 +  * Add new hooks: canremove, canrename, rename. (intrigeri)
 +  * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
 +  * po: New plugin, suporting translation of wiki pages using po files.
 +    (intrigeri)
  
-  -- Joey Hess <joeyh@debian.org>  Mon, 20 Apr 2009 19:40:25 -0400
+  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
  
- ikiwiki (3.13) UNRELEASED; urgency=low
+ ikiwiki (3.14) unstable; urgency=low
+ 
+   * highlight: New plugin supporting syntax highlighting of pretty much
+     anything.
+   * debian/control: Add suggests for libhighlight-perl, although
+     that package is not yet created by Debian's highlight source package.
+     (See #529869)
+   * format: Provide a htmlizefallback hook that other plugins
+     can use to handle formats that are not suitable for general-purpose
+     htmlize hooks. Used by highlight.
+   * Fix test suite to not rely on an installed copy of ikiwiki after
+     underlaydir change. Closes: #530502
+   * Danish translation update. Closes: #530877
+ 
+  -- Joey Hess <joeyh@debian.org>  Mon, 01 Jun 2009 13:05:34 -0400
+ 
+ ikiwiki (3.13) unstable; urgency=low
  
    * ikiwiki-transition: If passed a nonexistant srcdir, or one not
      containing .ikiwiki, abort with an error rather than creating it.

diff --cc debian/control
index 05ccd0df332d2bc1347c4e862c3e1d95bcb2f1d3,233de8f7c52e525c6c53cda47c526a4ceff39b85..5205ed74951c2cbcdf4f5f8d3e666555c1532f12
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -35,7 -35,7 +35,8 @@@ Suggests: viewvc | gitweb | viewcvs, li
    liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl,
    libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl,
    sparkline-php, texlive, dvipng, libtext-wikicreole-perl,
-   libsort-naturally-perl, libtext-textile-perl, po4a (>= 0.35-1), gettext
 -  libsort-naturally-perl, libtext-textile-perl, libhighlight-perl
++  libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
++  po4a (>= 0.35-1), gettext
  Conflicts: ikiwiki-plugin-table
  Replaces: ikiwiki-plugin-table
  Provides: ikiwiki-plugin-table

diff --cc t/syntax.t
Simple merge