Merge ^/head r305220 through r305300.
authordim <dim@FreeBSD.org>
Fri, 2 Sep 2016 19:44:23 +0000 (19:44 +0000)
committerdim <dim@FreeBSD.org>
Fri, 2 Sep 2016 19:44:23 +0000 (19:44 +0000)
commit706921d3f403ab065c091b0df2e780e2b0950bf9
treeacb3ff5bbf88503f7aa3e8c929f11a54a78d1dd8
parentf6b85870a85d0eaa0247fff845c928d77d34289b
parente5074fa18e1026973d644cd128dcf5a9e4b415fa
Merge ^/head r305220 through r305300.
Makefile.inc1