From 55203d82abeaeab0fa141acba17bbbdf81e7f176 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 25 May 2013 20:53:36 +0200
Subject: [PATCH] get files from 0.15 branch

---
 ChangeLog  | 6 ++++++
 autogen.sh | 2 +-
 gajim.nsi  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8e73e6be..41912096c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@ Gajim 0.16 ()
   * Support XEP-0224 Attention
   * Support XEP-0191 Blocking command
 
+Gajim 0.15.4 (25 May 2013)
+
+  * Fix usage of OTR plugin
+  * Fix connection to non-SSL server
+  * Fix receiving GPG-encrypted messages while offline.
+
 Gajim 0.15.3 (17 March 2013)
 
   * Better handling of SSL errors
diff --git a/autogen.sh b/autogen.sh
index f68eb6f43..8b99755eb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-  gajimversion="0.15.3"
+  gajimversion="0.15.4"
   if [ -d ".hg" ]; then
     node=$(hg  tip --template "{node}")
     hgversion="-${node:0:12}"
diff --git a/gajim.nsi b/gajim.nsi
index 7471e8d49..e3380bc86 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -200,7 +200,7 @@ Section "Gajim" SecGajim
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.3"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.4"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
 	WriteUninstaller "$INSTDIR\Uninstall.exe"