Merge tag 'v2.0.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:49:17 +0000 (13:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:49:17 +0000 (13:49 -0400)
commitd4499c76b8d4aa2187ad38c5cb0e1683585ae369
tree9edfac1345d18c300cae062bacb213ea68b96198
parentbea7b5bb2d767f79e36de35b5a59786774b18378
parent009acbb304211837b0663410cfa27337f8611444
Merge tag 'v2.0.6' into develop

v2.0.6