From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 23 Jan 2012 10:33:35 +0000 (+0000)
Subject: Merge branch 'dbus-1.4', rejecting commit 08dd53c14b53b88c
X-Git-Tag: dbus-1.5.10~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61758931005407de85952169e8253a72805e59ef;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4', rejecting commit 08dd53c14b53b88c
---

61758931005407de85952169e8253a72805e59ef
diff --cc NEWS
index c1aa63186,7703661cc..3aae0a123
--- a/NEWS
+++ b/NEWS
@@@ -1,6 -1,9 +1,9 @@@
 -D-Bus 1.4.18 (UNRELEASED)
 +D-Bus 1.5.10 (UNRELEASED)
  ==
  
+ • Allow all configured auth mechanisms, not just one (fd.o #45106,
+   Pavel Strashkin)
+ 
  • Improve cmake build system (Ralf Habacker):
    · simplify XML parser dependencies (fd.o #41027)
    · generate build timestamp (fd.o #41029)