From: Philip Chimento <philip.chimento@gmail.com>
Date: Sat, 11 Feb 2012 23:57:53 +0000 (+0100)
Subject: Merge commit 'cbb35cca'
X-Git-Tag: v0.9~32
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=f36804297035475779848559f13fc1984ebf8441

Merge commit 'cbb35cca'
---

f36804297035475779848559f13fc1984ebf8441