]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable-unity
authorDamir Tomic <viperus@ntp.org>
Thu, 25 Jun 2015 07:22:01 +0000 (09:22 +0200)
committerDamir Tomic <viperus@ntp.org>
Thu, 25 Jun 2015 07:22:01 +0000 (09:22 +0200)
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 558bac19lfUVb4QC_qDJRKpdUniEPQ


Trivial merge