]> git.ipfire.org Git - thirdparty/chrony.git/commitdiff
Merge branch '2.4-stable' into HEAD
authorMiroslav Lichvar <mlichvar@redhat.com>
Tue, 22 Nov 2016 15:06:05 +0000 (16:06 +0100)
committerMiroslav Lichvar <mlichvar@redhat.com>
Tue, 22 Nov 2016 15:06:05 +0000 (16:06 +0100)

Trivial merge