[master] changelog for #1570 (forgot to push, and it caused a conflict)

diff --cc ChangeLog
index d75de2cc309c0dbf7ed4e0eda28d03d0ca3fcb9a,0a2e37503f1df1f2dccdaa98630c18864fab4478..313f675f233df459f50589f5e03397e3dd235732
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,11 +1,20 @@@
- 375.  [bug]           jinmei, vorner
++376.  [bug]           jinmei, vorner
 +      The new query handling module of b10-auth did not handle type DS
 +      query correctly: It didn't look for it in the parent zone, and
 +      it incorrectly returned a DS from the child zone if it
 +      happened to exist there.  Both were corrected, and it now also
 +      handles the case of having authority for the child and a grand
 +      ancestor.
 +      (Trac #1570, git 2858b2098a10a8cc2d34bf87463ace0629d3670e)
 +
+ 375.  [func]      jelte
+       Modules now inform the system when they are stopping. As a result, they
+       are removed from the 'active modules' list in bindctl, which can then
+       inform the user directly when it tries to send them a command or
+       configuration update. Previously this would result in a 'not responding'
+       error instead of 'not running'.
+       (Trac #640, git 17e78fa1bb1227340aa9815e91ed5c50d174425d)
+ 
  374.  [func]*     stephen
        Alter RRsetPtr and ConstRRsetPtr to point to AbstractRRset (instead
        of RRset) to allow for specialised implementations of RRsets in