Merge branch 'hotfix/1.1.9'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 8 Jun 2016 19:14:59 +0000 (15:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 8 Jun 2016 19:14:59 +0000 (15:14 -0400)
commitd03609a2cea034278c76b7b0e317a48a81650637
tree8fd49e21ba7ee160a312d68678a26a6328280b3a
parent3702396456c9bbac377e7051052be19362c226ae
parenta0a73270b543dc1c97421b7b002d92fc6c316021
Merge branch 'hotfix/1.1.9'