Merge from head
authorbapt <bapt@FreeBSD.org>
Tue, 13 Oct 2015 20:57:37 +0000 (20:57 +0000)
committerbapt <bapt@FreeBSD.org>
Tue, 13 Oct 2015 20:57:37 +0000 (20:57 +0000)
commit5c14aeefe0b39210b25d0f069ad0518c152c6431
tree261781e54f87de9e429cd90fed72514e952fcd9e
parentcaab9e01a4fc5618e1b5a7e51983a5d50cc3b609
parent804e50d7252c0e4ed7c8c534759562fdac9796f9
Merge from head