summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRALOVICH, Kristof <tade60@freemail.hu>2014-04-07 22:43:38 +0200
committerRALOVICH, Kristof <tade60@freemail.hu>2014-04-07 22:43:38 +0200
commit3bfc1d964ae92182f881d3ba62161bd9689fd4f5 (patch)
treece1a79e920c8bd91750a649564a34a42b3295ad4
parent2a879ecaf28e9a9de1abfdf23c99e7506bd35b0a (diff)
parent434e735d2e5de33b61c8f92e7ba3444785101a69 (diff)
Merge tag '1.16-1'
Conflicts: debian/changelog
-rw-r--r--debian/changelog4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index de1df88..4cccc6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,13 @@ antpm (1.16-2) UNRELEASED; urgency=low
antpm (1.16-1) unstable; urgency=low
+ * Team upload
+
[ RALOVICH, Kristof ]
* Merge tag 'upstream/20140302'
* debian/copyright: document removal of GPLv2 only code
- -- Kristof Ralovich <ralovich@in.tum.de> Sun, 02 Mar 2014 11:27:28 +0100
+ -- Christian Perrier <bubulle@debian.org> Wed, 19 Mar 2014 07:00:02 +0100
antpm (1.15-1) unstable; urgency=low