From c70a3e71466f7c9c199a8464c4f3189c0e1a22d6 Mon Sep 17 00:00:00 2001
From: Martin Mahner <martin@mahner.org>
Date: Sat, 12 Apr 2014 11:04:13 -0400
Subject: [PATCH] Changelog Update

---
 CHANGELOG | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index b66769d..f113921 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,14 @@
 Changelog
 =========
 
-2.6 (dev)
+2.6 (2014-04-12)
 ----------------
 
 * Fix for the rare case of duplicate slug (secret id) generation.
+* A new 'code' lexer renders source code with no highlighting.
+* Whitespace fixes with tab indention and word wrap mode.
+* Installation docs.
+
 
 2.5 (2014-01-21)
 ----------------