svn commit: r256339 - stable/10

[Dag-Erling Smørgrav]

Author: des
Date: Fri Oct 11 20:26:45 2013
New Revision: 256339
URL: http://svnweb.freebsd.org/changeset/base/256339

Log:
  Move mergeinfo to the right place.
  
  Approved by:	re (gjb)

Modified:
Directory Properties:
  stable/10/   (props changed)
  stable/10/ObsoleteFiles.inc   (props changed)