Merge branch 'hotfix/1.2.11' v1.2.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 3 Oct 2016 12:23:32 +0000 (08:23 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 3 Oct 2016 12:23:32 +0000 (08:23 -0400)
commitc16d2df2d5168be2e99658bf2e7ff6d109c06cee
tree773c2fb2471df1e23a477255e746dcbfa56c742b
parentf46da89cf9815cb83876296fab54b3b520cecbbb
parent7b71f6f64bb294af1007c7ac0cc40341ecb71a91
Merge branch 'hotfix/1.2.11'