From: Charles Plessy <https://launchpad.net/~plessy>
Date: Mon, 15 Jul 2013 01:05:48 +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=f59fd4070f1e36ccc558bf5021dd375e65ca0788;p=source.git

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

Conflicts:
	Debian/debiâneries/triggers.en.po
---

f59fd4070f1e36ccc558bf5021dd375e65ca0788