Author: stefan2 Date: Wed Feb 25 12:18:33 2015 New Revision: 1662204 URL: http://svn.apache.org/r1662204 Log: On the svn-mergeinfo-normalizer branch: Sync with /trunk and resolve a trivial text conflict in build.conf.
[This commit notification would consist of 64 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
