Merge pull request #2636 from berleon/master
authorSergio Guadarrama <sguada@gmail.com>
Mon, 22 Jun 2015 15:36:33 +0000 (08:36 -0700)
committerSergio Guadarrama <sguada@gmail.com>
Mon, 22 Jun 2015 15:36:33 +0000 (08:36 -0700)
fixed _force_color check, fixes #2635


Trivial merge