Merge branch 'hotfix/1.3.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Jul 2015 13:56:54 +0000 (09:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Jul 2015 13:56:54 +0000 (09:56 -0400)
commit652ab8e70dd7c78f67677a54d1479062dcbd828d
tree840a3d3ab8fe086e1a936818a5133e3f6c8ef89f
parent580f0337012a5c24e0088d18f03163686a3f17e1
parent1fb0e1be5346e7dc901f852082f4dc7a1cd76fb5
Merge branch 'hotfix/1.3.5' into develop