Merge ^/head r295544 through r295600.
authordim <dim@FreeBSD.org>
Sat, 13 Feb 2016 16:02:12 +0000 (16:02 +0000)
committerdim <dim@FreeBSD.org>
Sat, 13 Feb 2016 16:02:12 +0000 (16:02 +0000)
commitf393760a8a7c87242739a64002290b7bda94cb27
treec08899f7a0f50404c030b4d36ab05e054a499796
parent7024e27ddea8cff63ccd142987756cba5001628d
parent0a4cceb161dfcb232aa9f5d8664e017c2590e0d9
Merge ^/head r295544 through r295600.
Makefile.inc1