get files from 0.15 branch

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

autogen.sh

 #!/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}"

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"
 

src/common/defs.py

@@ -27,7 +27,7 @@ docdir = '../'
 basedir   = '../'
 localedir = '../po'
 
-version = '0.15.3.0'
+version = '0.15.4.0'
 import subprocess
 try:
     node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,