Merge branch '2.x'

TooTallNate · TooTallNate · commit dcb37b2ca4ac · 2017-09-22T15:50:53.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,11 @@
   * Update: update "browserify" to v14.4.0
   * Fix: fix Readme typo (#473)
 
+2.6.9 / 2017-09-22
+==================
+
+  * remove ReDoS regexp in %o formatter (#504)
+
 2.6.8 / 2017-05-18
 ==================
 
