From: Charles Plessy <https://launchpad.net/~plessy>
Date: Sun, 7 Oct 2012 13:29:40 +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=9faacb2c9ef594bfedb0a93d3499b06c7632085e;p=source.git

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

Conflicts:
	index.en.po
	index.mdwn
---

9faacb2c9ef594bfedb0a93d3499b06c7632085e