From: intrigeri <intrigeri@boum.org>
Date: Sat, 17 Jan 2009 23:38:31 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~247
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e9e75f5f29d78b0631f98d9b0fa93184fcb181fe

Merge commit 'upstream/master' into prv/po

Conflicts:

	t/syntax.t
---

e9e75f5f29d78b0631f98d9b0fa93184fcb181fe
diff --cc t/syntax.t
index ddb0da073,d09d17f7f..8c96d1d84
--- a/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));