From: Charles Plessy <https://launchpad.net/~plessy>
Date: Sun, 1 Jan 2012 10:28:06 +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=0e16c7a51ef5978637921a5b2fac3f78c662b1f5;p=source%2F.git

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

Conflicts:
	Debian/debiâneries/tout-dans-git.en.po
---

0e16c7a51ef5978637921a5b2fac3f78c662b1f5