merge stable

diff --cc po/fr.po
index 8b9689e1749895787a1843832d664519a286f1af,f275022c6dbc2337834b9e1cfd0b30aa7ec39fb0..4349e56d97d3e00b412790bf950c4aa330c3a495
--- 1/po/fr.po
--- 2/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"