From: Charles Plessy <https://launchpad.net/~plessy>
Date: Mon, 13 Feb 2012 14:09:18 +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=039eaf8f5114db560d712d12555815a03a80289b;p=source%2F.git

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

Conflicts:
	Debian/debiâneries/étrange-megumi.en.po
---

039eaf8f5114db560d712d12555815a03a80289b