Merge pull request #2492 from sigmavirus24/release/v2.6.0 v2.6.0
authorIan Cordasco <sigmavirus24@users.noreply.github.com>
Sat, 14 Mar 2015 16:43:32 +0000 (11:43 -0500)
committerIan Cordasco <sigmavirus24@users.noreply.github.com>
Sat, 14 Mar 2015 16:43:32 +0000 (11:43 -0500)
Bump version and add release notes for 2.6.0


Trivial merge