]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
authorDamir Tomic <viperus@ntp.org>
Mon, 29 Jun 2015 18:14:59 +0000 (20:14 +0200)
committerDamir Tomic <viperus@ntp.org>
Mon, 29 Jun 2015 18:14:59 +0000 (20:14 +0200)
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55918b23vIZGS1zmBcaNLcNTaPKz0w


Trivial merge