From 85fcdbd49154d315f0a548a1228ccb3c59827ab9 Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Wed, 24 Mar 2010 06:56:25 +0000
Subject: [PATCH]  - Merged changes from trunk (885:887)

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

diff --git a/ChangeLog b/ChangeLog
index e42a7354d..88bdd2894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 PolarSSL ChangeLog
 
+= Version 0.13.1 released on 2010-03-24
+Bug fixes
+   * Fixed Makefile in library that was mistakenly merged
+   * Added missing const string fix in ssl_tls
+
 = Version 0.13.0 released on 2010-03-21
 Features
    * Added option parsing for host and port selection to