From: Marijn van Vliet Date: Sat, 18 Jun 2011 09:30:45 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara X-Git-Tag: v0.9~74 X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=e58377549f7512c03a2bf8346e82533d77acbd39 Merge branch 'master' of ssh://git.stderr.nl/projects/chimara/chimara --- e58377549f7512c03a2bf8346e82533d77acbd39