]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:ntp-stable-unity
authorDamir Tomic <viperus@ntp.org>
Sun, 7 Jun 2015 08:52:06 +0000 (10:52 +0200)
committerDamir Tomic <viperus@ntp.org>
Sun, 7 Jun 2015 08:52:06 +0000 (10:52 +0200)
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55740636QmMX1iukf7Rb0p4l5au5Pw


Trivial merge