Merge branch 'hotfix/1.2.26' v1.2.26
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 15:50:54 +0000 (11:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 15:50:54 +0000 (11:50 -0400)
commit25a98974eda9c95e7acff933135eded85d0eedbc
tree8efc38fa59f68b02d3ac0dfb6515fb349091596e
parent33e67fc3addcd5e8badda1d365ddb8660bc5e590
parentfd341a2d250f16e063fa14193fa2d7cdfeb35e70
Merge branch 'hotfix/1.2.26'