]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge perlinger@psp-deb1.ntp.org:ntp-dev-2570
authorJuergen Perlinger <perlinger@ntp.org>
Sun, 2 Mar 2014 08:26:08 +0000 (09:26 +0100)
committerJuergen Perlinger <perlinger@ntp.org>
Sun, 2 Mar 2014 08:26:08 +0000 (09:26 +0100)
into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-dev-2570

bk: 5312eb206cHvTUV6kYAWawqMTzOLww


Trivial merge