diff options
| author | Julien Valroff <julien@kirya.net> | 2011-04-16 16:47:41 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2011-04-16 16:47:41 +0200 |
| commit | d43e203266b3d61dac1499351ec20dc57c1728b2 (patch) | |
| tree | d0ed723b249d1ccb0df2c8b1ea0009d1e7390116 /debian/copyright | |
| parent | 1d2747f5ec6d056b394335caf5e53598635fbec1 (diff) | |
| parent | 7dd4f231f394157a6ebd1504808e86dc335f6841 (diff) | |
Merge branch 'master' into squeeze-backportsdebian/1.14-9_bpo60+1
Conflicts:
debian/changelog
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/copyright b/debian/copyright index 9c4f680..c7de0ab 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173 Upstream-Name: mailgraph Upstream-Contact: David Schweikert <david@schweikert.ch> Source: http://mailgraph.schweikert.ch/pub/ @@ -17,7 +17,7 @@ License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version - 2 of the License + 2 of the License. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied |