svn commit: r287630 - user/dim/merge-test

[Dimitry Andric]

Author: dim
Date: Thu Sep 10 21:08:54 2015
New Revision: 287630
URL: https://svnweb.freebsd.org/changeset/base/287630

Log:
  Attempt to merge.

Modified:
Directory Properties:
  user/dim/merge-test/   (props changed)