Merge branch 'hotfix/1.3.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Aug 2015 16:38:18 +0000 (12:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Aug 2015 16:38:18 +0000 (12:38 -0400)
commita933d01eb943734235d6f37c6d207f9b480a5afe
treef4c9116085397701afa6f12ced62a1a4def18916
parent652ab8e70dd7c78f67677a54d1479062dcbd828d
parentd89a478941ee96106a83c8f0f81c69aa8a10f09a
Merge branch 'hotfix/1.3.6' into develop