On the 1.8.x-r1477876 branch: merge r1477876 from trunk, resolving conflicts.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1478010 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1477876 branch: merge r1477891,1478001 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1478011 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1477876 branch: merge r1479605 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1481992 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1477876 branch: catch up to 1.8.x@1482006.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1477876@1482014 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1482779.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483326 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1482724.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483329 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1477876 group.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483353 13f79535-47bb-0310-9956-ffa450edef68
* CHANGES (for 1.8.x): Merge from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483354 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Prevent the automatic merge script from merging approved changes
   automatically, because we might not want to put them into 1.8.0.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483357 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1483391 and r1483397.


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

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483401 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Introduce a new category to move approved but not-to-be-merged items to

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483430 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: add r1483557 and vote for it

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483565 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: remove conflict marker accidentally committed in r1483565

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483571 13f79535-47bb-0310-9956-ffa450edef68
* CHANGES (for 1.8.x): Merge from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483609 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1483781 for backport to 1.8.0.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483795 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: vote for r1483781.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483908 13f79535-47bb-0310-9956-ffa450edef68
Create branch for libsvnjavahl version check.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-libsvnjavahl-version@1483910 13f79535-47bb-0310-9956-ffa450edef68
Adjust the hard-coded version that is expected for Subversion in
JavaHL's JNI loading code.

[in subversion/bindings/javahl]

* src/org/apache/subversion/javahl/NativeResources.java: Adjust version.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-libsvnjavahl-version@1483913 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Propose r1483913.

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