Merge tag 'v1.2.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:30:16 +0000 (13:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:30:16 +0000 (13:30 -0500)
commit0876062157f07f53c6a05754c1df6ba04da22711
treef7ef25389f5003a033052c3d763ac82bc45f0562
parentf0e57146813e2c3da86b30eb63538b8085300c6a
parent2c9c6e7e3ef3251c51bcafcb8e52d4fe482ca7c9
Merge tag 'v1.2.14' into develop

v1.2.14