Merge pull request #2365 from sigmavirus24/release/2.5 v2.5.0
authorIan Cordasco <icordasc+github@coglib.com>
Mon, 1 Dec 2014 23:22:17 +0000 (17:22 -0600)
committerIan Cordasco <icordasc+github@coglib.com>
Mon, 1 Dec 2014 23:22:17 +0000 (17:22 -0600)
Release v2.5.0


Trivial merge