get files from 0.15 branch

1 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 268e637c5..483da2af9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Gajim 0.15.3 (17 March 2013)
+  * Better handling of SSL errors
+  * Better handling of canceling file transfer
+  * Improve farstream calls
+  * Minor fixes and improvements
+
+Gajim 0.15.2 (30 October 2012)
+
+  * Show punycode encoded urls if they contain non-ascii chars
+  * Fix crash when pressing Esc in chat window
+  * Support Network Manager 0.9
+  * decrypt GPG messages in the correct order
+
 Gajim 0.15.1 (29 August 2012)
 
   * Switch from python-farsight to python-farstream