From: P. F. Chimento <philip.chimento@gmail.com>
Date: Sat, 15 Jan 2011 12:10:07 +0000 (+0100)
Subject: Merge branch 'master' of github.com:wmvanvliet/Chimara
X-Git-Tag: v0.9~159
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=89081782541e85e079f64839ffb26b4e74273eb7

Merge branch 'master' of github.com:wmvanvliet/Chimara
---

89081782541e85e079f64839ffb26b4e74273eb7