]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 23 Feb 2011 00:38:39 +0000 (19:38 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 23 Feb 2011 00:38:39 +0000 (19:38 -0500)
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4d64570fY97qfdODabee-3gv7-kXwg

1  2 
sntp/Makefile.am

Simple merge