Merge branch 'hotfix/1.1.21' V1.1.21
authorLaury GvR <laury@gaslightmedia.com>
Wed, 9 Dec 2015 20:05:01 +0000 (15:05 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 9 Dec 2015 20:05:01 +0000 (15:05 -0500)
commit2f3f0553cbc99e3cc64b1bb28fb605723b8a1775
treee60ef1cab924744d2702d420621a2b86d3435437
parenta79734204d3709f1193068ec5ebb72dcf8887c0c
parent98419dd144d4efbb26cfec75f9e363758e235d59
Merge branch 'hotfix/1.1.21'