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

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

ed91d840318ed6ebfe3a5a77fa17114ddbf56640