K 10
svn:author
V 3
gjb
K 8
svn:date
V 27
2017-01-06T22:28:56.687825Z
K 7
svn:log
V 155
Further clarify the source and target branches when merging.
While here, bump the Copyright year.

Submitted by:	ngie
Sponsored by:	The FreeBSD Foundation

END