Merge branch 'maint'

Conflicts:
	scripts/repo-add.sh.in

3 files changed, 13 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index b525b104..005c789f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.5.4         - fix display of lists on non-TTYs and other output fixes
+              - fix group selection entry for large inputs (FS#24253)
+              - fix divide by zero when downloading zero length files
+              - flush terminal input before reading response (FS#20538)
+              - allow files to be replaced by directories (FS#24904)
+              - makepkg: fix filenames with spaces and noextract (FS#25100)
+              - scripts: remove ln -f option for POSIX compliance (FS#24893)
+              - various small documentation updates
+              - minor translation updates: de, fi
 3.5.3         - segfault when creating lock in non-existent dir (FS#24292)
               - segfault when uninstalling broken backed-up symlink (FS#24230)
               - --print should not enable --noconfirm (FS#24287)
diff --git a/configure.ac b/configure.ac
index 309a591a..247c5318 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,12 +42,12 @@ AC_PREREQ(2.62)
 #     pacman_version_micro += 1
 
 m4_define([lib_current], [6])
-m4_define([lib_revision], [3])
+m4_define([lib_revision], [4])
 m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [5])
-m4_define([pacman_version_micro], [3])
+m4_define([pacman_version_micro], [4])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 
diff --git a/doc/index.txt b/doc/index.txt
index 5fd3f3bc..05c24b5a 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -65,6 +65,8 @@ Releases
 `------------`-------
 Date         Version
 ---------------------
+2011-08-10   v3.5.4
+2011-06-07   v3.5.3
 2011-04-18   v3.5.2
 2011-03-23   v3.5.1
 2011-03-16   v3.5.0