merge

ChangeLog

@@ -7,6 +7,8 @@ Gajim 0.15 (XX XX 2011)
   * IBB
   * Nested roster group
   * Roster filtrering
+  * UPower support
+  * GPG support for windows
 
 Gajim 0.14.4 (22 July 2011)
 

autogen.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-  gajimversion="0.15-alpha1"
+  gajimversion="0.15-beta2"
   if [ -d ".hg" ]; then
     node=$(hg  tip --template "{node}")
     hgversion="-${node:0:12}"

setup_win32.py

@@ -49,11 +49,11 @@ options = {
 
 setup(
     name='Gajim',
-    version='0.14.1',
+    version='0.15',
     description='A full featured Jabber client',
     author='Gajim Development Team',
-    url='http://www.gajim.org/',
-    download_url='http://www.gajim.org/downloads.php',
+    url='http://gajim.org/',
+    download_url='http://gajim.org/downloads.php',
     license='GPL',
     options=options,
     executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'),

src/common/defs.py

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