Merge branch 'hotfix/1.0.20' v1.0.20
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 21 Jan 2016 15:38:40 +0000 (10:38 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 21 Jan 2016 15:38:40 +0000 (10:38 -0500)
commitc9c3cfde0aa91894210a3c50abc077861d8c05d2
treed85968d036894f5ad8e3a35c90bcf2d6f4e4afd3
parenta6850667d6d76ea18f6461bbe5dd0c931f5430fa
parent44906181beab6d241717117a6267942e377c49ab
Merge branch 'hotfix/1.0.20'