]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge perlinger@psp-fb1.ntp.org:ntp-stable-2745
authorJuergen Perlinger <perlinger@ntp.org>
Wed, 29 Apr 2015 17:39:56 +0000 (19:39 +0200)
committerJuergen Perlinger <perlinger@ntp.org>
Wed, 29 Apr 2015 17:39:56 +0000 (19:39 +0200)
into  hydra.(none):/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-2745

bk: 5541176cz9aU8aDxZCzY_mmrxsuavg


Trivial merge