Merge branch 'maint'

Message updates made this one a bit messy, but nothing too bad.

Conflicts:
	lib/libalpm/add.c
	lib/libalpm/remove.c

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 268ecd7d..70f8317b 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -92,7 +92,7 @@ int SYMEXPORT alpm_add_target(char *target)
 				i->data = pkg;
 			} else {
 				_alpm_log(PM_LOG_WARNING,
-						_("skipping %s-%s because newer version %s is in the target list\n"),
+						_("skipping %s-%s because newer version %s is in target list\n"),
 						pkgname, pkgver, transpkg->version);
 				_alpm_pkg_free(pkg);
 			}