1.0.2dev: Revert unintended change to svn:mergeinfo property in [11853], in which the merge of [11831:11832] was recorded.

git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11902 af82e41b-90c4-0310-8c96-b1721e28e2e2
1.1.2dev: Merge [11831] from 1.0-stable.


git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11903 af82e41b-90c4-0310-8c96-b1721e28e2e2
1.1.2dev: Merged [11904:11906] from 1.0-stable (fix for #11259).


git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11908 af82e41b-90c4-0310-8c96-b1721e28e2e2
1.1.2dev: Merge [11907] from 1.0-stable (fix for #11259).


git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11909 af82e41b-90c4-0310-8c96-b1721e28e2e2
1.1.2dev: Removed stray character accidentally introduced while reviewing merge of [11909] before commit.

git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11910 af82e41b-90c4-0310-8c96-b1721e28e2e2
1.1.2dev: Revert unintended changes from [11909] which were due to improper resolution of a merge conflict.

git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11911 af82e41b-90c4-0310-8c96-b1721e28e2e2