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