]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity/
authorDamir Tomic <viperus@ntp.org>
Mon, 10 Aug 2015 10:30:38 +0000 (12:30 +0200)
committerDamir Tomic <viperus@ntp.org>
Mon, 10 Aug 2015 10:30:38 +0000 (12:30 +0200)
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55c87d4ekwXtHjzhBcIkNn6KAuSCbg

1  2 
sntp/tests/Makefile.am

Simple merge