From: Charles Plessy <https://launchpad.net/~plessy>
Date: Thu, 10 Feb 2011 01:37:32 +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=44a6e6b96402af003462e3fe1ad612ace0f8a79c;p=setup%2F.git

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

Conflicts:
	Debian/debiâneries/réaction-en-chaîne.en.po
---

44a6e6b96402af003462e3fe1ad612ace0f8a79c