Merge pull request #530 from mhaskel/2.1.0-prep
authorBryan Jen <bryan.jen@gmail.com>
Tue, 9 Jun 2015 17:42:34 +0000 (10:42 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Tue, 9 Jun 2015 17:42:34 +0000 (10:42 -0700)
commita9d2ecd8d5184e6c26daf4fcbef489a906735be5
tree174a503b9e06520f6cf16c7cce0dd56b847ae36c
parentf1fe05ec2b73ba5dd8466f85fa40e61a29586f8c
parent083bed34378ad7056e6117ef19d8e9fb838817a3
Merge pull request #530 from mhaskel/2.1.0-prep

2.1.0 prep