From a589b6e7fe204e832df3c52dd387aa8c30a79b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 26 Mar 2014 22:48:23 +0100
Subject: [PATCH] Changelog for 2.4

---
 CHANGELOG                                        | 16 ++++++++++++++++
 .../src/main/res/raw/help_changelog.html         |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 548dd1289..e7f4c567a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+2.4
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
+* new unified key list
+* colorized key fingerprint
+* support for keyserver ports
+* deactivate possibility to generate weak keys
+* much more internal work on the API
+* certify user ids
+* keyserver query based on machine-readable output
+* lock navigation drawer on tablets
+* suggestions for emails on creation of keys
+* search in public key lists
+* and much more improvements and fixes…
+
 2.3.1
 * hotfix for crash when upgrading from old versions
 
diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
index 0e7c4d212..595878fe7 100644
--- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
+++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html
@@ -23,6 +23,11 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>and much more improvements and fixes…</li>
 </ul>
 
+<h2>2.3.1</h2>
+<ul>
+<li>hotfix for crash when upgrading from old versions</li>
+</ul>
+
 <h2>2.3</h2>
 <ul>
 <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>