Merge branch 'hotfix/1.0.12' v1.0.12
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 4 Feb 2016 20:44:08 +0000 (15:44 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 4 Feb 2016 20:44:08 +0000 (15:44 -0500)
commitf1c4bf3d6d0ac41d756dfded100a3ed4bf384536
tree47461079ea622b1831055e3ab1508dff2fff048b
parent9746b6f4990b99af03b489f475c50f1a9ed62ef0
parentab4fcc537e06d1b61809c0e639e8a68c7c46da18
Merge branch 'hotfix/1.0.12'