svn propchange: r1643189 - svn:log

[br...@apache.org]

Author: breser
Revision: 1643189
Modified property: svn:log

Modified: svn:log at Tue Dec  9 07:03:08 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Dec  9 07:03:08 2014
@@ -1 +1,8 @@
-On the '1.7.x-r1643074' branch: merge r1643074 from trunk.
+Merged r1643119 from '1.8.x-r1643074' branch onto '1.7.x' branch.
+
+[Note from the future: This was a mis-merge on the wrong branch,
+ it was reverted in r1643986 and r1643991.  The original commit message
+ said it was a merge of r1643074 from trunk onto 1.7.x-r1643074 which
+ was not the case and has been corrected above.  Note that r1643119 is
+ also not a merge from r1643074 on trunk either, as the files don't
+ match r1643074 on trunk.]