- Merged changes from trunk (885:887)

diff --git a/ChangeLog b/ChangeLog
index e42a735..88bdd28 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