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)
commit37897ec80e7736f86cb5d747d6147b41d5e27eec
treeb3b90fe126ecb3c827aca44d628c7bf565eb31a7
parent35f773056485f06fc42e9e4dced930de7a3e1fa2
parenta79d7855e8febc2e4c8527e621f6f162e5f85db8
Merge pull request #215 from mhaskel/1.2.0-prep

1.2.0 prep