Merge remote-tracking branch 'stevee/armv5tel-xorg-x11-server'

Conflicts:
	xorg-x11-server/xorg-x11-server.nm

diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm
index 25065741875d5b4e461cb3fabe3c643585a3b337..365c9e6a0341722012dd56b3e8812c8a707dc56b 100644 (file)
--- a/xorg-x11-server/xorg-x11-server.nm
+++ b/xorg-x11-server/xorg-x11-server.nm
@@ -5,7 +5,7 @@
 
 name       = xorg-x11-server
 version    = 1.8.2
-release    = 5.1
+release    = 6
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = X/Server