diff options
author | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
commit | f4a1732b0e65ea4459098e4e852dff10a5af9320 (patch) | |
tree | 60b8cf4b1677504cb86f301bb62a33cc769fafd9 /debian/copyright | |
parent | cc5be82b8b7cfe3b679d8ba4f0d62e0894d9f964 (diff) | |
parent | 0978be7affa6222d91a0bc71ddd1e86f81fc56cd (diff) | |
download | ikiwiki-f4a1732b0e65ea4459098e4e852dff10a5af9320.tar ikiwiki-f4a1732b0e65ea4459098e4e852dff10a5af9320.tar.gz |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'debian/copyright')
-rw-r--r-- | debian/copyright | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/copyright b/debian/copyright index 0299d8a77..1e2a27349 100644 --- a/debian/copyright +++ b/debian/copyright @@ -126,6 +126,10 @@ 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+ |