[email protected] wrote on Mon, Sep 10, 2012 at 12:52:32 -0000: > Author: cmpilato > Date: Mon Sep 10 12:52:32 2012 > New Revision: 1382806 > > URL: http://svn.apache.org/viewvc?rev=1382806&view=rev > Log: > On the '1.6.x' branch: > > * STATUS > (r1338810 group): Add r1339154, resolving danielsh's suggestion to > do so, and boldly assuming that philip would +1 the obvious > additional fix. This approves the change. > (r1330410 group, r1088602 group): Vote affirmatively, approving.
The r1338810 and r1088602 groups conflict and cannot be merged by the script --- manual intervention is required.
