Merge tag 'v1.1.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 19:04:22 +0000 (14:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 19:04:22 +0000 (14:04 -0500)
commitc7eff4b63f304eba3627cd2c115aac00a4f3b587
treed3634788697741af599e3355b125159cc54cb357
parent50ed9f446b3c70a2ba87fb14edc2de7ae9563f58
parente823ad4073668e2e4c7c214a64b040ec428bc04c
Merge tag 'v1.1.2' into develop

v1.1.2