BIND 10 master, updated. ff36bea0314636d978f61923cc7292364c1808fa Merge branch 'master' of git+ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  ff36bea0314636d978f61923cc7292364c1808fa (commit)
       via  d686e00a5dd1efae29891e8056af324ea983d187 (commit)
      from  da57d4a08a2e14e5e6589138692674894f667f54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ff36bea0314636d978f61923cc7292364c1808fa
Merge: d686e00a5dd1efae29891e8056af324ea983d187 da57d4a08a2e14e5e6589138692674894f667f54
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed May 11 21:53:48 2011 +0200

    Merge branch 'master' of git+ssh://bind10.isc.org/var/bind10/git/bind10

commit d686e00a5dd1efae29891e8056af324ea983d187
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed May 11 21:53:03 2011 +0200

    Missing name in ChangeLog

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 974ff65..4ee99c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,7 +25,7 @@
 	extended description are no longer preceded by a "+".
 	(Trac #900, git b395258c708b49a5da8d0cffcb48d83294354ba3)
 
-231.	[func]*
+231.	[func]*     vorner
 	The logging interface changed slightly. We use
 	logger.foo(MESSAGE_ID).arg(bar); instead of logger.foo(MESSAGE_ID, bar);
 	internally. The message definitions use '%1,%2,...' instead of '%s,%d',