* STATUS: Propose my prop conflict changes from today for 1.8.0.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1480677 13f79535-47bb-0310-9956-ffa450edef68