Merge branch 'hotfix/1.0.15' v1.0.15
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Feb 2016 19:50:01 +0000 (14:50 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Feb 2016 19:50:01 +0000 (14:50 -0500)
commit1746314a6d75af9fd74c2f84e789cd81512e4a17
tree6f14ba4be8e759186a90fae26320103b0914289e
parent7ef5f602fdc7cc4778729529bafbca66f5a08c1a
parentcfdabd35fa951e01cd57b72d37140c54baca2c06
Merge branch 'hotfix/1.0.15'