Merge branch 'hotfix/1.0.2' v1.0.2
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 6 Aug 2015 20:56:19 +0000 (16:56 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 6 Aug 2015 20:56:19 +0000 (16:56 -0400)
commite581f15f6c13b7214ceef88d417449b15d6aa58d
treec2fc29f10822bc685b236f86c7af85c33484e165
parent95e8affd2ca80bf41f1b46f88ca588dd7ec5784b
parent744c890c6bf5160e3d2eebe2272e1cfc7ff0dc62
Merge branch 'hotfix/1.0.2'