diff options
author | Michael Vogt <mvo@debian.org> | 2014-04-01 17:49:06 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-04-01 17:49:06 +0200 |
commit | 4c3722e3a74f183b331b0a782017ae442ca143fb (patch) | |
tree | 683cb69a004aedcf38151aadf0a30c5261ffe83e /doc/po/apt-doc.pot | |
parent | d13bb95849fd168200554972b4295c40933e2461 (diff) | |
parent | 5cfd6ef6c6ad67658c042453075e54ac23d10245 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'doc/po/apt-doc.pot')
-rw-r--r-- | doc/po/apt-doc.pot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 19fdd73e2..524b1afdb 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.16.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-04-01 14:24+0200\n" +"POT-Creation-Date: 2014-04-01 15:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |