From: Marijn van Vliet Date: Sat, 18 Jun 2011 20:55:23 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara X-Git-Tag: v0.9~73^2~1 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=7eda771842a214ee6c9b60aee0a982253fcc29e6;p=projects%2Fchimara%2Fchimara.git Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara --- 7eda771842a214ee6c9b60aee0a982253fcc29e6