Merge psp-deb1.ntp.org:/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2740

bk: 54c98046PrA-_WVrJ_DO04ySebvEjg

diff --cc ChangeLog
index 2d42621f92f02d49801b66ab97a1e210f7713cc9,3cb6124dcc2b42563b100f51e604d848d5328e5e..c41929beb99b60230911f369dc55fa845be30f97
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,6 +1,14 @@@
  ---
  
 +* [Bug 2627] shm refclock allows only two units with owner-only access
 +  rework: reverted sense of mode bit (so default reflects previous
 +  behaviour) and updated ducumentation.
 +* [Bug 2738] Missing buffer initialization in refclocK_parse.c::parsestate().
 +* [Bug 2739] Parse driver with PPS enabled occasionally evaluates
 +  PPS timestamp with wrong sign. 
 +  Removed some German umlauts.
+ * [Bug 2740] Removed some obsolete code from the parse driver.
 +* [Bug 2741] Incorrect buffer check in refclocK_parse.c::parsestatus().
  ---
  (4.2.8p1-RC1) 2015/01/24 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc ntpd/refclock_parse.c
Simple merge