| commit | e1f3c5fc8f48ff58453802c5e6b83b23d26cad07 | [log] [tgz] |
|---|---|---|
| author | djames <djames@unknown> | Sat Sep 09 16:59:05 2006 +0000 |
| committer | djames <djames@unknown> | Sat Sep 09 16:59:05 2006 +0000 |
| tree | 60e1c4d6e7768049f8545d9cfcc70efe026586d2 | |
| parent | 7c5767b827fdf5307fa8afff1c447e862872e9a3 [diff] |
Merge r21392 from trunk, resolving conflicts. Branch: 1.4.x-r21392 Release: 1.4.1 git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.4.x-r21392@861468 13f79535-47bb-0310-9956-ffa450edef68