Merge from HEAD
authorbapt <bapt@FreeBSD.org>
Tue, 25 Aug 2015 20:14:50 +0000 (20:14 +0000)
committerbapt <bapt@FreeBSD.org>
Tue, 25 Aug 2015 20:14:50 +0000 (20:14 +0000)
commit2a77c3b71d27973d4ffac086902715be69266202
tree420361e546af3d9b54e3a1573b672510b15062e4
parent795d1994935c72862e9c0f538c4f83b5b649ca96
parent80b01acf73d4f8ff74678c4e7f57db989dba2366
Merge from HEAD
Makefile.inc1
ObsoleteFiles.inc
etc/mtree/BSD.usr.dist
lib/libc/locale/utf8.c
tools/build/mk/OptionalObsoleteFiles.inc
usr.bin/Makefile
usr.bin/localedef/collate.c