From: Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
Date: Tue, 28 Aug 2012 08:57:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=eec3f2cefd211052c2cc19a0a3add4fbef171459

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

eec3f2cefd211052c2cc19a0a3add4fbef171459