]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable-unity
authorDamir Tomic <viperus@ntp.org>
Fri, 19 Jun 2015 13:52:56 +0000 (15:52 +0200)
committerDamir Tomic <viperus@ntp.org>
Fri, 19 Jun 2015 13:52:56 +0000 (15:52 +0200)
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55841eb8Cgj_ux8R3C5e-SOTTmRH-g


Trivial merge