From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Jan 2012 15:57:46 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b28e544dd3a0881786a36bd85bb7a7c94cc173a5;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	dbus/dbus.nm
	openldap/openldap.nm
---

b28e544dd3a0881786a36bd85bb7a7c94cc173a5
diff --cc dbus/dbus.nm
index b96796b7f,c751bf14c..6bfd2ea6b
--- a/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = dbus
 -version    = 1.4.14
 -release    = 3
 +version    = 1.4.16
- release    = 1
++release    = 2
  
  groups     = System/Daemons
  url        = http://www.freedesktop.org/software/dbus/
diff --cc openldap/openldap.nm
index a664039f1,699f02360..c6bfb7ee2
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = openldap
 -version    = 2.4.25
 -release    = 3
 +version    = 2.4.28
- release    = 1
++release    = 2
  
  groups     = System/Daemons
  url        = http://www.openldap.org/