commit 7350ab18df19992711fedaf5b26265988ac1edb8
author Simon Butcher <simon.butcher@arm.com> Wed May 23 17:55:02 2018 +0100
committer Simon Butcher <simon.butcher@arm.com> Wed May 23 17:55:02 2018 +0100
tree 9955f684d8627da50dd4a59b13e826cbed8abb98
parent e64bf3968e184324e3436e7e6aea80028e894385

Fix ChangeLog for PR #1582 following merge

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0fc2bdc..008a16f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS x.x.x branch released xxxx-xx-xx
+
+Bugfix
+
+   * Fix braces in mbedtls_memory_buffer_alloc_status(). Found by sbranden, #552.
+
 = mbed TLS 2.1.12 branch released 2018-04-30
 
 Security
@@ -70,7 +76,6 @@
    * Improve robustness of mbedtls_ssl_derive_keys against the use of
      HMAC functions with non-HMAC ciphersuites. Independently contributed
      by Jiayuan Chen in #1377. Fixes #1437.
-   * Fix braces in mbedtls_memory_buffer_alloc_status(). Found by sbranden, #552.
 
 = mbed TLS 2.1.11 branch released 2018-03-16