Merge branch 'maint'

Also bump the devel version on the master branch to 3.2.0devel.

1 files changed, 3 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 0b7769dc..ad051435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,9 @@ m4_define([lib_revision], [0])
 m4_define([lib_age], [2])
 
 m4_define([pacman_version_major], [3])
-m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [2])
-m4_define([pacman_version_suffix], [])
+m4_define([pacman_version_minor], [2])
+m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_suffix], [devel])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 m4_define([pacman_display_version],