Merge branch 'hotfix/1.2.22' v1.2.22
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 21:10:28 +0000 (16:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 21:10:28 +0000 (16:10 -0500)
commite66d444f20ded3d3d3e3abdd3a1389aa7bfa8d64
tree8523d3cce666731cef1dbcae418fbbe5dafede5d
parent38105216edd21bc135c889dac5ea27da0e9d6ad2
parent20f312945e19668214f47ddb51cb98a5a88d29c4
Merge branch 'hotfix/1.2.22'