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

bk: 55903f5dhnJ4EF432wRckZhb9e2lJw


Trivial merge