From: Kevin McCarthy <kevin@8t8.us>
Date: Wed, 6 Jul 2016 17:43:56 +0000 (-0700)
Subject: merge stable
X-Git-Tag: neomutt-20160822~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d495ef7f629396bfd64cf5ebb9a29c3aa235f67;p=neomutt

merge stable
---

6d495ef7f629396bfd64cf5ebb9a29c3aa235f67
diff --cc po/fr.po
index 8b9689e17,f275022c6..4349e56d9
--- a/po/fr.po
+++ b/po/fr.po
@@@ -19,10 -19,10 +19,10 @@@
  # , fuzzy
  msgid ""
  msgstr ""
 -"Project-Id-Version: Mutt 1.6.0\n"
 +"Project-Id-Version: Mutt 1.6.1\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2016-06-20 10:10+0200\n"
- "PO-Revision-Date: 2016-06-20 10:10+0200\n"
+ "POT-Creation-Date: 2016-07-06 10:39-0700\n"
+ "PO-Revision-Date: 2016-03-21 01:29+0100\n"
  "Last-Translator: Vincent Lefevre <vincent@vinc17.net>\n"
  "Language-Team: Vincent Lefevre <vincent@vinc17.net>\n"
  "Language: fr\n"