Merge branch 'master' of https://github.com/klamonte/jexer
authorKevin Lamonte <kevin.lamonte@gmail.com>
Fri, 27 Mar 2015 22:23:10 +0000 (18:23 -0400)
committerKevin Lamonte <kevin.lamonte@gmail.com>
Fri, 27 Mar 2015 22:23:10 +0000 (18:23 -0400)

Trivial merge