Merge branch 'hotfix/1.2.21' v1.2.21
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:12:49 +0000 (14:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:12:49 +0000 (14:12 -0500)
commit38105216edd21bc135c889dac5ea27da0e9d6ad2
tree221c26fb016a47dae9d091c14bd91f87766ba8f1
parent24a3394e625940d7d4426c0f6798f29cfb948fb3
parent1643732106e2b2151cc35942365f7a3ea649628f
Merge branch 'hotfix/1.2.21'