Merge branch 'hotfix/1.0.30'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 30 Aug 2016 15:59:58 +0000 (11:59 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 30 Aug 2016 15:59:58 +0000 (11:59 -0400)
commitc35857121ee0d6922de3ec2b770f882075aa7f36
treea456f2a5aedbe2b17ca43234b11b14c4e982b8a4
parent504759e9ba1589173b1d6dc1c9f01270fce85891
parent27fe24986fd084928cd443547d1d767407ca2524
Merge branch 'hotfix/1.0.30'