From: Charles Plessy <https://launchpad.net/~plessy>
Date: Sat, 15 Jan 2011 06:16:13 +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=a964ef5172a9d3bea38e2b28957e20943744ebbd;p=source%2F.git

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

a964ef5172a9d3bea38e2b28957e20943744ebbd