From: intrigeri <intrigeri@boum.org>
Date: Sun, 8 Mar 2009 23:32:10 +0000 (+0100)
Subject: Merge commit 'upstream/master' into prv/po
X-Git-Tag: 3.15~206
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f4a1732b0e65ea4459098e4e852dff10a5af9320?hp=-c

Merge commit 'upstream/master' into prv/po
---

f4a1732b0e65ea4459098e4e852dff10a5af9320
diff --combined debian/copyright
index 0299d8a77,67f0ac540..1e2a27349
--- a/debian/copyright
+++ b/debian/copyright
@@@ -118,14 -118,14 +118,18 @@@ Copyright
   © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
  License: GPL-2+
  
 +Files: po.pm
 +Copyright: © 2008-2009 intrigeri <intrigeri@boum.org>
 +License: GPL-2+
 +
  Files: 404.pm
  Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
  License: GPL-2+
  
+ Files: wmd.pm
+ Copyright: © 2009 William Uther
+ License: GPL-2+
+ 
  Files: doc/logo/*
  Copyright: © 2006 Recai Oktaş <roktas@debian.org>
  License: GPL-2+