svn commit: r265293 - stable/10

[Glen Barber]

Author: gjb
Date: Sun May  4 00:09:07 2014
New Revision: 265293
URL: http://svnweb.freebsd.org/changeset/base/265293

Log:
  MFC r264907, r264908, r264922:
    Record mergeinfo for r264907 and r264908, reverted
    in r264922.
  
  This commit is for merge tracking purposes only.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
Directory Properties:
  stable/10/   (props changed)