Merge commit 'upstream/master' into prv/po

diff --combined debian/copyright
index 0299d8a777daab128f1c1932d1340b340822b960,67f0ac540200c66e1456cd5388d28c537ea67d19..1e2a273491653ad2aeb9114b29d95932185dba30
--- 1/debian/copyright
--- 2/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+