Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Feb 2016 18:28:12 +0000 (13:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Feb 2016 18:28:12 +0000 (13:28 -0500)
commit569e50842ba80ce7524301b8bce1abbe63931c47
tree79971feab64016aa7beb83bcf22c6be730d595ba
parent406fea780d3996d21e7f3f2101c4a72f1b6e2a3c
parent7b9214d18d0731562fdcd3f4f9b7087c70a480a8
Merge branch 'hotfix/1.0.2'