Merge branch 'master' of git+ssh://ianthe.matthew.ath.cx/home/mjj29/scm/dbus-java

Conflicts:
	org/freedesktop/dbus/test/test.java

1 files changed, 13 insertions, 1 deletions

diff --git a/changelog b/changelog
index 7b9554e..77315ab 100644
--- a/changelog
+++ b/changelog
@@ -1,16 +1,28 @@
+Version 2.6.1:
+
+   * Fix bug in disconnected signal/exception handling (Spotted by Serkan Kaba
+         <serkan_kaba -at- yahoo -dot- com>)
+
 Version 2.6:
 
 	* Add DBusConnection.releaseBusName API
 	* Add DBusConnection.PeerSet for tracking peer lifetimes
 	* Fix bug where DBusDaemon never sends NameOwnerChanged/NameLost
 	  signals
+	* Patches from Omair Majid <omajid -at- redhat -dot- com> to fix
+	  DBusCall manpage and allow alternative docbook-to-man implementations.
+	* Fix dependency on unix.jar even in tcp mode
+	* Fix Path/ObjectPath cast issues (reported by Greg DeAngelis
+	  <gdeangel -at- gmail -dot- com>)
+	* Fix behavior when disconnected (spotted by Christopher 
+	  Armstrong <carmstrong -at- fastmail -dot- com -dot- au>)
 
 Version 2.5.1:
 
 	* Fix for possible NPex in DBusDaemon
 	* Add hexdump.jar to Class-Path for libdbus-java.jar
 	* Add GetAll to properties interface (Patch from
-	  Sveinung Kvilhaugsvik <sveinung84@users.sourceforge.net>)
+	  Sveinung Kvilhaugsvik <sveinung84 -at- users -dot- sourceforge -dot- net>)
 	* Make signals with renamed interfaces and member names work
 	  if they are explicitly listened for (Partially fixes: #18257).
 	  Also make the error reporting better when it doesn't work.