]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk2.ntp.org./ntp-stable
authorDave Hart <hart@ntp.org>
Sun, 21 Nov 2010 02:27:37 +0000 (02:27 +0000)
committerDave Hart <hart@ntp.org>
Sun, 21 Nov 2010 02:27:37 +0000 (02:27 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1725

bk: 4ce88399i0DAwOc7m9BaeTt943tlEA

1  2 
sntp/Makefile.am

Simple merge