Merge branch 'master' into dev

author Thomas Citharel <tcit@tcit.fr>

Sat, 3 Jan 2015 10:38:32 +0000 (11:38 +0100)

committer Thomas Citharel <tcit@tcit.fr>

Sat, 3 Jan 2015 10:38:32 +0000 (11:38 +0100)
author Thomas Citharel <tcit@tcit.fr>
Sat, 3 Jan 2015 10:38:32 +0000 (11:38 +0100)
committer Thomas Citharel <tcit@tcit.fr>
Sat, 3 Jan 2015 10:38:32 +0000 (11:38 +0100)
diff --cc locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
Simple merge
author	Thomas Citharel <tcit@tcit.fr>
	Sat, 3 Jan 2015 10:38:32 +0000 (11:38 +0100)
committer	Thomas Citharel <tcit@tcit.fr>
	Sat, 3 Jan 2015 10:38:32 +0000 (11:38 +0100)