Merge tag 'v1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 21:36:07 +0000 (17:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 21:36:07 +0000 (17:36 -0400)
commitda8e3d70a0ac9dd15c9941e18976567961f1e1e3
treec715ff84331bd8b96138d1e5961e89ec18ef94df
parentd7d505cc69fef4fed6040160afdc6fbfb5afb9fb
parent3edf2e965e8683202a2dbcccc5dc7e14f83f7304
Merge tag 'v1.1.5' into develop

v1.1.5