Merge branch 'feature/v0.5.5' into develop

2015-03-05 12:57:41 -08:00
parent 2027bac434 fb5f62ce21
commit b15436b5f4
2 changed files with 5 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v0.5.5 (2015-03-06)
+- Update bundled C++ libcapnp to v0.5.1.2 security release
+
+
 ## v0.5.4 (2015-03-02)
 - Update bundled C++ libcapnp to v0.5.1.1 security release
 - Add bootstrap RPC methods
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ _this_dir = os.path.dirname(__file__)

 MAJOR = 0
 MINOR = 5
-MICRO = 4
+MICRO = 5
 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)