Merge branch 'hotfix/1.0.1' v1.0.1
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 21:17:01 +0000 (16:17 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 21:17:01 +0000 (16:17 -0500)
commit841b9e29cdd4d75f701eaae35520e0348f5f2b89
treea2c35ec82ef6ac79cfaf47d19475e271cd86bed7
parent0876a1b2881cdfb80c70a7caaacb2069d6cd7bea
parent8f8706aebde4280c01844fb913947125e57a8976
Merge branch 'hotfix/1.0.1'