From 72ed0a7339c7a08ad29ac8b8f3f61008c251632b Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 10 Jul 2009 15:48:46 +0200
Subject: [PATCH] fix merge error. Fixes #5154

---
 configure.ac       | 2 +-
 src/common/defs.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0f2b0b18f..9261c14f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.12.1.5-dev],[http://trac.gajim.org/],[gajim])
+		[0.12.3.1-dev],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
diff --git a/src/common/defs.py b/src/common/defs.py
index 42599f47a..c321440d0 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
 datadir = '../'
 localedir = '../po'
 
-version = '0.12.1.5-dev'
+version = '0.12.3.1-dev'
 
 import sys, os.path
 for base in ('.', 'common'):