Merge pull request #431 from mhaskel/1.2.0-prep 1.2.x 1.2.0
authorTravis Fields <cyberious@users.noreply.github.com>
Mon, 3 Nov 2014 21:11:56 +0000 (13:11 -0800)
committerTravis Fields <cyberious@users.noreply.github.com>
Mon, 3 Nov 2014 21:11:56 +0000 (13:11 -0800)
1.2.0 prep


Trivial merge