commit | 6c1ce3d5a0721152c763213133db0de79f4695b6 | [log] [tgz] |
---|---|---|
author | Kamesh J <kameshj@apache.org> | Tue Oct 21 11:30:17 2008 +0000 |
committer | Kamesh J <kameshj@apache.org> | Tue Oct 21 11:30:17 2008 +0000 |
tree | b22f5f583a07aebd870021c0a3e0a4978fbdd85a | |
parent | f16fb22464e69455a5a6c90037c1096c99476a52 [diff] |
Merge r33641,r33644 from trunk. Resolved white space conflict. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r33641@873883 13f79535-47bb-0310-9956-ffa450edef68