]> git.ipfire.org Git - thirdparty/chrony.git/commitdiff
Merge branch '2.2-security'
authorMiroslav Lichvar <mlichvar@redhat.com>
Wed, 20 Jan 2016 11:18:42 +0000 (12:18 +0100)
committerMiroslav Lichvar <mlichvar@redhat.com>
Wed, 20 Jan 2016 11:18:42 +0000 (12:18 +0100)
1  2 
chrony.texi.in
ntp_core.c

diff --cc chrony.texi.in
Simple merge
diff --cc ntp_core.c
Simple merge