Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:08:01 +0000 (09:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:08:01 +0000 (09:08 -0400)
commit6182957363522b3e9a7c56ea400ec831cca81c86
treec34a5bd4dda98a45cccb63116c137a429c2b049f
parente6b7a8468953fd90b34923c441688ebd2994060c
parent20484acaba356233d40173d4d7d081884d482977
Merge branch 'hotfix/1.0.12'