From 7fb4a79f505a0a5abbaeae4a8820aec6eaebbbcd Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Thu, 12 Sep 2013 12:00:52 +0200
Subject: [PATCH] Added merged functionality to ChangeLog

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8a15b6e8a..171ccd44e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@ Features
    * Support for session tickets (RFC 5077)
    * Certificate Request (CSR) generation with extensions (key_usage,
      ns_cert_type)
+   * X509 Certificate writing with extensions (basic_constraints,
+     issuer_key_identifier, etc)
    * Optional blinding for RSA, DHM and EC
 
 Changes