Merge branch 'hotfix/1.0.6' v1.0.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:34:24 +0000 (15:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:34:24 +0000 (15:34 -0500)
commite50c7f13d4b6a1ec59745b860a83b29e1a8f3811
treee2046d26b9cbddff3da41295422e5e271b375fa4
parent472e7e75bd82661107bb85bddfd05d55c403457f
parentd5aa45ec7ae5e89d3f0ee6d2398c0616aa08cd87
Merge branch 'hotfix/1.0.6'