From: Charles Plessy <https://launchpad.net/~plessy>
Date: Sun, 9 Nov 2014 12:40:22 +0000 (+0900)
Subject: Merge branch 'master' of ssh://charles-plessy-org.branchable.com
X-Git-Url: https://source.charles.plessy.org/?a=commitdiff_plain;h=7c9a8250f3733f34e379695511632397d7cac0d1;p=source.git

Merge branch 'master' of ssh://charles-plessy-org.branchable.com

Conflicts:
	Debian/debiâneries/résolution-générale.en.po
---

7c9a8250f3733f34e379695511632397d7cac0d1