1.1.2beta1: Record-only merge on [11319:11320].


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