Merge ^/head r285284 through r285340.
authordim <dim@FreeBSD.org>
Thu, 9 Jul 2015 22:46:28 +0000 (22:46 +0000)
committerdim <dim@FreeBSD.org>
Thu, 9 Jul 2015 22:46:28 +0000 (22:46 +0000)
commit1ebfd3aba929e33294751473ec48782e765ba703
tree6634ef6c7ca672e4a3a03955c02ffe470e425d7f
parent91db3ac96dc3ffb6a6f9079ef98cfe0b9af0f05a
parent0a09d271d954ca7bfd06b9b71dd7d7fb6439c2c7
Merge ^/head r285284 through r285340.