Merge pull request #217 from mhaskel/test
authorTravis Fields <cyberious@users.noreply.github.com>
Tue, 4 Nov 2014 22:34:24 +0000 (14:34 -0800)
committerTravis Fields <cyberious@users.noreply.github.com>
Tue, 4 Nov 2014 22:34:24 +0000 (14:34 -0800)
Merge 1.2.x into master


Trivial merge