Merge branch 'maint'

Conflicts:
	lib/libalpm/sync.c
	src/util/pactree.c

1 files changed, 2 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 5b54ee9c..cfd3340f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,12 +42,12 @@ AC_PREREQ(2.62)
 #     pacman_version_micro += 1
 
 m4_define([lib_current], [7])
-m4_define([lib_revision], [1])
+m4_define([lib_revision], [2])
 m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [4])
 m4_define([pacman_version_minor], [0])
-m4_define([pacman_version_micro], [1])
+m4_define([pacman_version_micro], [2])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])