From: Marijn van Vliet <w.m.vanvliet@gmail.com>
Date: Sat, 18 Jun 2011 13:22:31 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
X-Git-Tag: v0.9~73^2~8
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=47c116d672f1d9f9a8251b4a384e856359e3738f

Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
---

47c116d672f1d9f9a8251b4a384e856359e3738f