* STATUS: Vote for branches/1.7.x-r1227815-conflict.

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