]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge perlinger@psp-fb1.ntp.org:ntp-stable-2808
authorJuergen Perlinger <perlinger@ntp.org>
Sat, 25 Apr 2015 06:30:16 +0000 (08:30 +0200)
committerJuergen Perlinger <perlinger@ntp.org>
Sat, 25 Apr 2015 06:30:16 +0000 (08:30 +0200)
into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-2808

bk: 553b3478eh2uIiedA64KPV_s2O4Nog


Trivial merge