Merge tag 'v1.0.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:12:58 +0000 (11:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:12:58 +0000 (11:12 -0400)
commite0ac6a0e3693754b4bf12c225084aec9deb80cb8
tree29ab3e154167e95e28e2ef29bd7f59f38592df6d
parent99a4df8a10166672358fb09a6b33ff806d310626
parentd48a788a4c87231d1f28e8b302b3dd43be610f78
Merge tag 'v1.0.6' into develop

v1.0.6