Merge branch 'maint'

Conflicts:
	lib/libalpm/be_local.c
	lib/libalpm/trans.c

1 files changed, 6 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 149a7327..0f608d0a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.4.2         - fix progress bar display with empty packages
+              - make pactest testsuite Python 2.7 compatible
+              - documentation: remove unnecessary "|| return 1"
+              - contrib/bacman: update package compression selection
+              - contrib/PKGBUILD.vim: add a few more license options
+              - translations: kk, pt, es updated
 3.4.1         - fix interaction of --needed and multiple repo groups (FS#20221)
               - bash completion: small fixes to prevent alias problems
               - rankmirrors: fix bogus/empty variable assignment (FS#19911)