1.1.3dev: record-only merge on [13315]


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