| commit | 8e4140d783d16ac74dd6a4a61698f0a7589508b1 | [log] [tgz] |
|---|---|---|
| author | Ben Reser <breser@apache.org> | Tue Feb 18 20:21:06 2014 +0000 |
| committer | Ben Reser <breser@apache.org> | Tue Feb 18 20:21:06 2014 +0000 |
| tree | 4409701272c1cc502fde06af2a8a0e42e298f88f | |
| parent | c3ad1f5f2466f6837bb575ea8d2c4b1c60e05bce [diff] |
* CHANGES: Merge r1565530 from trunk with --accept=mc to avoid conflicts from
1.8/1.9 CHANGES entries.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1569520 13f79535-47bb-0310-9956-ffa450edef68