Merge tag 'v1.2.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 17:16:13 +0000 (12:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 17:16:13 +0000 (12:16 -0500)
commitcc4b1b5eee7393469244e10a8ebe8aacfbb292ab
treefa7674b445c7f31eb575c633872ac6c3684298a3
parent0135567405cbd68d82ec2bf44ae7f248108861db
parent24a3394e625940d7d4426c0f6798f29cfb948fb3
Merge tag 'v1.2.20' into develop

v1.2.20