Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 17:24:52 +0000 (13:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 17:24:52 +0000 (13:24 -0400)
commita2e935762cdfcd7ad9d0ba4b7fbd45207c6be6f8
tree0763bd18e4215bc8c56503f72600afa0f1976c79
parent51e8674d7131f0c5bfb74d480e41639499074ead
parentb3ad6e4b67643a56b8af6c828aadce367e360a63
Merge branch 'hotfix/1.0.2'