Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:21:26 +0000 (10:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:21:26 +0000 (10:21 -0400)
commitec7da04c1e488285c062707e8bc0ae249ec4abce
tree8ffd99dfc88e702ff1e337e348a999c22f6f23c7
parent42df7d2d3ce9431775c32a5a59292f6ba8cb34cd
parent8c0a45dd65a413f92274bb4a5b74627cf3545551
Merge tag 'v1.0.17' into develop

v1.0.17