Merge tag 'v1.2.16' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 19:52:29 +0000 (14:52 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 11 Dec 2015 19:52:29 +0000 (14:52 -0500)
commita89247e1d27dcecfff1488ca7f2ef9963e143abd
tree7df40bf96623d3e01d46d283eaf94d684f5e30ee
parentd3be41f18a50298d56a5e8845fac244921dfd703
parent4552ed8af567f35a69356eabaa1b228c150020d8
Merge tag 'v1.2.16' into develop

v1.2.26