Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 19:04:12 +0000 (14:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 19:04:12 +0000 (14:04 -0500)
commite823ad4073668e2e4c7c214a64b040ec428bc04c
treed3634788697741af599e3355b125159cc54cb357
parent17d0f5376068ab4da4a7e0acc0bda85856e5ffaf
parent56243fde744e577444f1b8d42ceb1a3ffd06b56b
Merge branch 'hotfix/1.1.2'