[master] fixed conflicts in changelog (due to me forgetting push?)

diff --cc ChangeLog
index 8811f2c04464045dd030361c41cac14375acba9e,e48d86b781a738b375203b35566c79f505b4f93f..fd23fd00be4a472403dc8b39def3178ce92d7d26
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,11 +1,19 @@@
- 391.  [func]*         jinmei
++392.  [func]*         jinmei
 +      libdns++: revised the (Abstract)MessageRenderer class so that it
 +      has a default internal buffer and the buffer can be temporarily
 +      switched.  The constructor interface was modified, and a new
 +      method setBuffer() was added.
 +      (Trac #1697, git 9cabc799f2bf9a3579dae7f1f5d5467c8bb1aa40)
 +
+ 391.  [bug]*          vorner
+       The long time unused configuration options of Xfrout "log_name",
+       "log_file", "log_severity", "log_version" and "log_max_bytes" were
 -      removed, as they had no effect (Xfrout uses the global logging framework).
 -      However, if you have them set, you need to remove them from the
 -      configuration file or the configuration will be rejected.
++      removed, as they had no effect (Xfrout uses the global logging
++      framework).  However, if you have them set, you need to remove
++      them from the configuration file or the configuration will be
++      rejected.
+       (Trac #1090, git ef1eba02e4cf550e48e7318702cff6d67c1ec82e)
+ 
  bind10-devel-20120301 released on March 1, 2012
  
  390.  [bug]           vorner