Merge ^/head r312201 through r312206.
authordim <dim@FreeBSD.org>
Sun, 15 Jan 2017 01:36:45 +0000 (01:36 +0000)
committerdim <dim@FreeBSD.org>
Sun, 15 Jan 2017 01:36:45 +0000 (01:36 +0000)
commitb419b2b9ad808f79755ef5d4d7b1e3eeccbc408d
tree2bd5f913c3e4ae959a418f4ccbb7b6f509783732
parent87332e7accc04da2e23d80847493768115c2d7cf
parentc23696ed2db1dc1520e36dd42291d9ce7733a957
Merge ^/head r312201 through r312206.