Merge branch 'hotfix/2.0.11' v2.0.11
authorLaury GvR <laury@gaslightmedia.com>
Fri, 3 Jun 2016 17:48:22 +0000 (13:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 3 Jun 2016 17:48:22 +0000 (13:48 -0400)
commit46c8f02e56c7583ee83407803cbff2b6d18521a1
tree2346ca26edd29e4d692489a608bf8b664fb1aa70
parenta2440f8eca71821b6a20765c92a69a4010eeb23b
parentb207ec699d238439d70c53f37321c1908bc2b6bd
Merge branch 'hotfix/2.0.11'