Author: julianfoad
Revision: 1643189
Modified property: svn:log
Modified: svn:log at Tue Dec 9 11:20:46 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Dec 9 11:20:46 2014
@@ -3,4 +3,8 @@ Merged r1643119 from '1.8.x-r1643074' br
[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.]
+ was not the case. As now written above, it was an indirect merge via
+ r1643119 on the '1.8.x-r1643074' branch of the original logical change
+ r1643074 on trunk. This change was meant to be merged to the
+ '1.7.x-r1643074' backport branch but was mistakenly merged straight to
+ the '1.7.x' branch.]
