Merge branch 'hotfix/1.0.28' v1.0.28
authorIan Weller <ian@gaslightmedia.com>
Mon, 25 Aug 2014 20:05:12 +0000 (16:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 25 Aug 2014 20:05:12 +0000 (16:05 -0400)
commit03111240d0fc6b0f67b0dcba638672544fea5015
treec557076a3844cff7c84239b323fc2abd682e63d1
parent5ec53a51b10ab246b2ee016a66590bcd62596315
parent917a2f1c09b13afaec09f1c29922b5e4377d77a4
Merge branch 'hotfix/1.0.28'