Merge branch 'hotfix/2.0.6' v2.0.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:49:10 +0000 (13:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:49:10 +0000 (13:49 -0400)
commit009acbb304211837b0663410cfa27337f8611444
tree9edfac1345d18c300cae062bacb213ea68b96198
parent47b864a7b6645c21f6c498c0945e2d041d205f7e
parentab4b9e7fc1999b72c1830ecfc1c4d829d0c09e32
Merge branch 'hotfix/2.0.6'