Merge branch 'release/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:53:12 +0000 (16:53 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:53:12 +0000 (16:53 -0500)
commite560176fd6a31594cd7ef7b1bb72e3e46596ee6b
treef2f54c660d2053bce37ecd6f63280435c0696ddb
parent05b0b426ea6c852f1e537413a5cd730bfc584bdc
parent91ebbcce52713e24451d7210cae562ec8d5528f2
Merge branch 'release/1.0.5'