Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 Feb 2016 20:59:14 +0000 (15:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 Feb 2016 20:59:14 +0000 (15:59 -0500)
commit58841d51bd1a99f17aef20fd3589377256e596a9
tree0df454a2cf67ecbff2808aadefc46263d39a7d90
parent0f32a12aab8e8ed12aa013ff6f7df908786747ab
parentc739135009f5a0800c3fff04c8ac99bc9ed817a8
Merge tag 'v1.0.18' into develop

v1.0.18