Merge branch 'hotfix/1.0.6' master v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:10:09 +0000 (12:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Jun 2016 16:10:09 +0000 (12:10 -0400)
commit8ee0fca6a9bcba2510293805283a4718566934b0
treefe40cbff4d7bdf9bd539955a67bbc54dfac9e1ed
parent7f6c8f666137746a2700d437f25797a1c353f32c
parent10e90a178a3120607a5be8ebea23b4b84afa1326
Merge branch 'hotfix/1.0.6'