Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Jun 2016 18:23:47 +0000 (14:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Jun 2016 18:23:47 +0000 (14:23 -0400)
commit5e3fb01a94852490296d85345bd9a77d170c94de
tree0964ca8088221d8d6ea3fb5a79a710fa29467a7e
parente198f35823a637849ea2f05bde287ff73f2a23e8
parent8eb6de374f412fb6a3bc5be4aeb77fd6339f6d62
Merge branch 'hotfix/1.0.15'