From: Philip Chimento Date: Sat, 16 Jul 2011 21:58:50 +0000 (+0200) Subject: Merge branch 'master' into browser X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=6fd0347f330cb24ef6145662023053a1c0f81a64 Merge branch 'master' into browser --- 6fd0347f330cb24ef6145662023053a1c0f81a64