Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:01:22 +0000 (17:01 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:01:22 +0000 (17:01 -0500)
commit1389a7fba1d84e6d962679565008bd46e914d063
tree4c69311a2822547407cd9887c88824b9eee8630f
parente560176fd6a31594cd7ef7b1bb72e3e46596ee6b
parenta51f926c8176bf6f0f469876156be203fc4b4453
Merge branch 'hotfix/1.0.6'