Merge from HEAD
authorbapt <bapt@FreeBSD.org>
Fri, 3 Apr 2015 23:23:09 +0000 (23:23 +0000)
committerbapt <bapt@FreeBSD.org>
Fri, 3 Apr 2015 23:23:09 +0000 (23:23 +0000)
commitef3b6ff94c6609e7710d581613d59bcfb79a9d60
treeac49a30b30ce969c4772b13c1717e8d6501cb8fc
parentd6ca866646a4418a704431c22c6cae618582f79c
parentb9992ffd9068115a674364943eeaf406b4d1565f
Merge from HEAD
Makefile
Makefile.inc1
contrib/ntp/ntpd/ntp_control.c