Merge branch 'hotfix/1.0.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 22:25:52 +0000 (18:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 22:25:52 +0000 (18:25 -0400)
commit3ab9eaeca3e8027edf65f6e6bc29af985e154dea
tree41bf1e4c59c848c6c9585da5209e264fc5eee1da
parent8b7a78cc0dedc40bc4f429ba9e2d1b6e3340264f
parent3656af626114577a4cc319143dfa80f7ecf934d9
Merge branch 'hotfix/1.0.2' into develop