Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Nov 2015 21:31:58 +0000 (16:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Nov 2015 21:31:58 +0000 (16:31 -0500)
commit9a5ea16b19095dfe56a3ff786f4a6a0d8813d0ed
tree3f7033b6c81fe1b4965a92657b0a864ba50b4148
parentc58615969b7e916220fe42326fa1cc85b5bac6fc
parent91e456fc34602b97942badd73f03b1b9e81bddd5
Merge branch 'hotfix/1.0.15'