Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity

into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/tflendrich/changelog/ntp-stable-unity

bk: 5590b8d5zCTECCVxaglmd5enUmukbg

diff --cc ChangeLog
index 527dcb7457d95713b6a899cc3d1a9dd1bf4bb622,87e925618be7a27afde0b850f3d9794ed310beca..d1f44c5c3fe8545e2f8d3a5dd0a8bbcc33e30d8f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -4,9 -4,7 +4,10 @@@
  * [Bug 2846] Report 'unsynchronized' status during the leap second.
    Fixed in Martin's changes to Bug 2855.  Martin Burnicki.
  * [Bug 2859] Improve raw DCF77 robustness deconding.  Frank Kardel.
 -* tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich
 +* [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
 +* README.leapsmear added.  Martin Burnicki.
 +* README.leapsmear edited.  Harlan Stenn.
++* tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich.
  ---
  (4.2.8p3-RC3) 2015/06/27 Released by Harlan Stenn <stenn@ntp.org>