Merge branch 'hotfix/1.2.14' v1.2.14
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:30:00 +0000 (13:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:30:00 +0000 (13:30 -0500)
commit2c9c6e7e3ef3251c51bcafcb8e52d4fe482ca7c9
treef7ef25389f5003a033052c3d763ac82bc45f0562
parent16e9eb8d2a5fc438bbb23e030553a8434e6f980c
parent279c394d1212b0ad692721b65c9eeecce9e8ecfb
Merge branch 'hotfix/1.2.14'