Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:41:20 +0000 (11:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:41:20 +0000 (11:41 -0400)
commitbe9ee695507fc4093c4e6debf39dcf05fc8c3eb4
tree29d311a4fb6b19c737e0ab16ca9d6eb96af08f6b
parent5a20be5298e3ea65ec95539a26371642360d82ff
parent035d243af81c76e8af5bafe80be7115431d86e9e
Merge branch 'hotfix/1.0.15'