From: Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
Date: Wed, 27 Apr 2011 12:00:43 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
X-Git-Tag: v0.9~89
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=29e55e3bcea55c5a30e766fea88a1665b5cabc33;p=projects%2Fchimara%2Fchimara.git

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

29e55e3bcea55c5a30e766fea88a1665b5cabc33