From 2a66dcc25d403f6371585fe3d2f70f0ec1781f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Roche?= <mrpollo@gmail.com>
Date: Wed, 4 May 2016 10:57:42 -0700
Subject: [PATCH] bump 2.5.0

---
 CHANGELOG.md                         | 18 ++++++++++++++++++
 docs/about/github_latest_release.txt | 21 +++++++++++++++++++++
 setup.py                             |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2fe4c4c4..7014c0cc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## Version 2.5.0 (2016-05-04)
+
+### Improvements
+* Catch and display message and attribute errors, then continue
+* Improved takeoff example docs
+* Deploy docs on successful merge into master (from CircleCI)
+* Drone delivery example, explain port to connect
+* MicroCGS example now uses SITL
+* Make running examples possible on Vagrant
+
+### Bug Fixes
+* Mav type for rover was incorrect
+* `_is_mode_available` can now handle unrecognized mode codes
+* Fix broken links on companion computer page
+* Fix infinite loop on channel test
+
+
+
 ## Version 2.4.0 (2016-02-29)
 
 ### Bug Fixes
diff --git a/docs/about/github_latest_release.txt b/docs/about/github_latest_release.txt
index 102656248..75e5b3248 100644
--- a/docs/about/github_latest_release.txt
+++ b/docs/about/github_latest_release.txt
@@ -3,6 +3,27 @@
 Changelog
 =========
 
+Version 2.5.0 (2016-05-04)
+--------------------------
+
+Improvements
+~~~~~~~~~~~~
+
+-  Catch and display message and attribute errors, then continue
+-  Improved takeoff example docs
+-  Deploy docs on successful merge into master (from CircleCI)
+-  Drone delivery example, explain port to connect
+-  MicroCGS example now uses SITL
+-  Make running examples possible on Vagrant
+
+Bug Fixes
+~~~~~~~~~
+
+-  Mav type for rover was incorrect
+-  ``_is_mode_available`` can now handle unrecognized mode codes
+-  Fix broken links on companion computer page
+-  Fix infinite loop on channel test
+
 Version 2.4.0 (2016-02-29)
 --------------------------
 
diff --git a/setup.py b/setup.py
index d0b4d8835..96099ecfa 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, Extension
 import platform
 
-version = '2.4.0'
+version = '2.5.0'
 
 setup(name='dronekit',
       zip_safe=True,