Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:49:12 +0000 (11:49 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:49:12 +0000 (11:49 -0500)
commit821159b2225ad0670c007fd09f7bb09a2543de21
treed64d77fc59b260d5141c5b66565fe19ffb1e82c9
parent46609ffc6560cb6b094fd72f9424c37b541f5e62
parentaf5478f62a9f65ea393367760cb3f53f9f0a4faf
Merge branch 'hotfix/1.1.2'