Merge ^/head r294599 through r294776.
authordim <dim@FreeBSD.org>
Tue, 26 Jan 2016 07:49:11 +0000 (07:49 +0000)
committerdim <dim@FreeBSD.org>
Tue, 26 Jan 2016 07:49:11 +0000 (07:49 +0000)
commite94fcba08326e935f67bf7cefa2cf2e3c4cb4be5
tree3e1d0673cef90c16df6215c7aefe0258d7768e91
parent125ab1d7f4735f4346042878c059d01decc67760
parent3715af248f8b9c60933bd1211bc486f4cfe90867
Merge ^/head r294599 through r294776.