From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 22 Jul 2013 09:01:18 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P375~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0336921ae741d0f3f4918fc3382229fdaa8c06b2;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/karlsson/bugs/ntp-dev-2413

bk: 51ecf4de2-ELcBFvi1weSNcyziJQLA
---

0336921ae741d0f3f4918fc3382229fdaa8c06b2
diff --cc ChangeLog
index d3092977f,e3b35cda6..e79a4d10e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,7 @@@
+ * [Bug 2368] Correct bug in previous attempt.
 +* [Bug 2413] Fix "make check" with automake >= 1.13.
  (4.2.7p374) 2013/07/21 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2368] make check troubles in libevent.
 -* [Bug 2413] Fix "make check" with automake >= 1.13.
  * [Bug 2425] setup SIGIO/SIGPOLL for asyncio on the read side
    of a socketpair for the worker thread.
  (4.2.7p373) 2013/07/20 Released by Harlan Stenn <stenn@ntp.org>