1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 289dc0011..1655f764c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
    - dtucker@cvs.openbsd.org 2012/09/07 01:10:21
      [clientloop.c]
      Merge escape help text for ~v and ~V; ok djm@
+   - dtucker@cvs.openbsd.org 2012/09/07 06:34:21
+     [clientloop.c]
+     when muxmaster is run with -N, make it shut down gracefully when a client
+     sends it "-O stop" rather than hanging around (bz#1985).  ok djm@
 
 20120906
  - (dtucker) OpenBSD CVS Sync