From: Ian Beckwith Date: Thu, 23 Jun 2011 23:57:35 +0000 (+0100) Subject: Merge branch 'upstream' into ckermit-212-beta X-Git-Tag: 301-1~30 X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=7d6f100e78719be0c4bdec4f9f80007bd0f6744d Merge branch 'upstream' into ckermit-212-beta --- 7d6f100e78719be0c4bdec4f9f80007bd0f6744d