Merge tag 'v1.1.10' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 16:01:06 +0000 (12:01 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 16:01:06 +0000 (12:01 -0400)
commit631ae51c5972b6577345a113aaafdc9ccc2c62eb
tree93e0bf2f00daf6272952adbb72c72092e5194037
parent37c78217200cb5bf35759b1b5fc9627ece57799f
parent494e5452059f6801fc48f8ddc58c02fcfc1845b3
Merge tag 'v1.1.10' into develop

Fixed merge conflict that made it into hotfix.