]> git.ipfire.org Git - ipfire-3.x.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Jan 2012 15:57:46 +0000 (16:57 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Jan 2012 15:57:46 +0000 (16:57 +0100)
commitb28e544dd3a0881786a36bd85bb7a7c94cc173a5
tree76827612a0a319b5362d47722a3842d20f403a18
parenta22ca966a85505646ea196fefef6e8a51ca8542d
parent72da3f6fe3508b862ed736df06b8e8744aa3e21c
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

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