Merge tag 'v1.0.37' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:38:42 +0000 (16:38 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:38:42 +0000 (16:38 -0400)
commit3f8a8a9502c4c789566fe5d8bc7bed779467c8f6
treef1761db1990b7688dc55f1e11835c35df96c2a4d
parente4a41f162b61f3a6f807df63e9de4a208eb32f5c
parent52cecc3aace31e2d0fc126ecf9696d289d58f34f
Merge tag 'v1.0.37' into develop

Fixed class redeclare error