Merge pull request #215 from mhaskel/1.2.0-prep
authorTravis Fields <cyberious@users.noreply.github.com>
Mon, 3 Nov 2014 19:59:40 +0000 (11:59 -0800)
committerTravis Fields <cyberious@users.noreply.github.com>
Mon, 3 Nov 2014 19:59:40 +0000 (11:59 -0800)
1.2.0 prep


Trivial merge