From: P. F. Chimento <philip.chimento@gmail.com>
Date: Sat, 13 Nov 2010 00:08:04 +0000 (+0100)
Subject: Merge branch 'master' of github.com:wmvanvliet/Chimara
X-Git-Tag: v0.9~175
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;ds=inline;h=b4100f943b14b9c5817dbcb3ee81f625c06a014a;hp=b4100f943b14b9c5817dbcb3ee81f625c06a014a;p=projects%2Fchimara%2Fchimara.git

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