svn commit: r267684 - in stable/9: . usr.sbin

[Glen Barber]

On Fri, Jun 20, 2014 at 06:47:28PM -0700, Devin Teske wrote:
> 
> > On Fri, Jun 20, 2014 at 06:21:32PM -0700, Devin Teske wrote:
> > > Because we've been told to only ever merge things to the root of a
> > > stable branch.
> > >
> > 
> > Only for stable/10 and later.  The stable/9 branch and earlier are merged
> the
> > "old way."
> > 
> 
> Crap. Sorry 'bout that then. So many different scenarios ;(

I've reverted the bogus mergeinfo in r267702.

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-stable-9/attachments/20140620/7636f38f/attachment.sig>