Merge branch 'hotfix/1.2.20' v1.2.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 17:16:05 +0000 (12:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 17:16:05 +0000 (12:16 -0500)
commit24a3394e625940d7d4426c0f6798f29cfb948fb3
treefa7674b445c7f31eb575c633872ac6c3684298a3
parent7449767eb8059133728aba55f8a223f7dbec0f8f
parent4d7592d5c3c14355e80227b65244d5fe0a040e16
Merge branch 'hotfix/1.2.20'