Merge tag 'v1.0.6' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 30 Dec 2015 16:54:42 +0000 (11:54 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 30 Dec 2015 16:54:42 +0000 (11:54 -0500)
commitc185b8444986648a6871c8c04e9f8f5fa83b3f45
tree595a6541886068cd31ab1b0bed9b991de54f6023
parent4e79c2cc956601f1afb5f65941cc5ce42bdd0361
parentae637e2349e13c4640da8c9d6f984d476e0fae06
Merge tag 'v1.0.6' into develop

1.0.6