Merge ^/head r293280 through r293429.
authordim <dim@FreeBSD.org>
Fri, 8 Jan 2016 17:42:14 +0000 (17:42 +0000)
committerdim <dim@FreeBSD.org>
Fri, 8 Jan 2016 17:42:14 +0000 (17:42 +0000)
commitb5c238fc65c2ef8cd6e839857fe5cfd813cd2c59
treeda8282d35996a372408778d38763fa68c3c354c5
parentfa38d85e2c222400fa30c70e8a913e8a213a97a7
parent368544f6729f740145f0b6572ec35ebe304692bf
Merge ^/head r293280 through r293429.
Makefile.inc1
lib/libstand/Makefile
tools/build/mk/OptionalObsoleteFiles.inc