Merge branch 'hotfix/1.2.16' v1.2.16
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 19:52:21 +0000 (14:52 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 19:52:21 +0000 (14:52 -0500)
commit4552ed8af567f35a69356eabaa1b228c150020d8
tree7df40bf96623d3e01d46d283eaf94d684f5e30ee
parente9c6a906d60b4907ec65f19ce60c18cc9c9a0196
parent84646d1ae55a203d419c3434f64f6ba14553bc1b
Merge branch 'hotfix/1.2.16'