Merge commit 'upstream/master' into prv/po

Conflicts:

	t/syntax.t

diff --combined t/syntax.t
index ddb0da073c9c4dddd7389f4d7cabc2b29a8fa948,d09d17f7f932deecb9c6f16e6911367ced9d4d35..8c96d1d848014e9145739515e974f0b5aac271ac
--- 1/t/syntax.t
--- 2/t/syntax.t
+++ b/t/syntax.t
@@@ -5,8 -5,8 +5,8 @@@ use Test::More
  
  my @progs="ikiwiki.in";
  my @libs="IkiWiki.pm";
- # monotone, external, blogspam, amazon_s3, po skipped since they need perl modules
- push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v blogspam.pm | grep -v amazon_s3.pm | grep -v po.pm`;
+ # monotone, external, amazon_s3 skipped since they need perl modules
 -push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v amazon_s3.pm`;
++push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v amazon_s3.pm | grep -v po.pm`;
  push @libs, 'IkiWiki/Plugin/skeleton.pm.example';
  
  plan(tests => (@progs + @libs));