From: Philip Chimento <philip.chimento@gmail.com>
Date: Tue, 11 Jan 2011 20:01:41 +0000 (-0500)
Subject: Merge branch 'master' of github.com:wmvanvliet/Chimara
X-Git-Tag: v0.9~159^2
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=00d75fa232c30a628fe7eac8afc0c932f67e7b6c;hp=--cc;p=projects%2Fchimara%2Fchimara.git

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

00d75fa232c30a628fe7eac8afc0c932f67e7b6c