diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-23 16:43:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-23 16:43:44 -0400 |
| commit | 7bba52254569047ef1d9f5752096f155b0a2be77 (patch) | |
| tree | 0c79effe8cbf7847e36557e4ed9fe10d08728a33 /debian | |
| parent | 6486452e4c94f5699d98d13e25a361435ed3ddeb (diff) | |
| parent | d822e37d0efc34f2267f275030de11cd3c7ff7bb (diff) | |
Merge branch 'master' into templatemove
Conflicts:
doc/templates.mdwn
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/copyright | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/copyright b/debian/copyright index ad72a0459..d4bb1009f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,11 @@ Files: * -Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info> +Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info> License: GPL-2+ The full text of the GPL is distributed as doc/GPL in ikiwiki's source, and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems. Files: templates/*, underlays/basewiki/*, doc/ikiwiki/directive/*, ikiwiki.setup, po/underlay/* -Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info> +Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info> License: other Redistribution and use in source and compiled forms, with or without modification, are permitted under any circumstances. No warranty. |