From: Charles Plessy <https://launchpad.net/~plessy>
Date: Mon, 10 Jan 2011 23:48:30 +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=7c0e7164b6ecbebf960fd7313a6f10c4661d1227;p=source.git

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

7c0e7164b6ecbebf960fd7313a6f10c4661d1227