Merge trunk revision 2956:

r2956 | sdake | 2010-06-21 11:17:47 -0700 (Mon, 21 Jun 2010) | 2 lines

Change version to 1.2.5 in trunk.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2957 fd59a12c-fef9-0310-b244-a6a79926bd2f

configure.ac

@@ -4,7 +4,7 @@
 # bootstrap / init
 AC_PREREQ([2.61])
 
-AC_INIT([corosync], [1.2.4], [openais@lists.osdl.org])
+AC_INIT([corosync], [1.2.5], [openais@lists.osdl.org])
 AM_INIT_AUTOMAKE([-Wno-portability])
 
 AC_CONFIG_SRCDIR([lib/coroipcc.c])