Merge branch 'master' into develop

danrot · danrot · commit 697bd997dffe · 2016-08-08T09:24:54.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-* dev-develop
+* 0.15.0 (2016-08-08)
     * FEATURE     #98 Added json converter
 
 * 0.14.0 (2016-07-21)
