Merge branch 'hotfix/1.0.28' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 25 Aug 2014 20:05:34 +0000 (16:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 25 Aug 2014 20:05:34 +0000 (16:05 -0400)
commit4d60e7b1fa128c2b944ed810768b3c69f8428c65
treec557076a3844cff7c84239b323fc2abd682e63d1
parentce883430f81183896a028d0c0c8162f2b65afaa4
parent917a2f1c09b13afaec09f1c29922b5e4377d77a4
Merge branch 'hotfix/1.0.28' into develop