| commit | 33d501d72a0c55e60588215b43f6817b91dfa944 | [log] [tgz] |
|---|---|---|
| author | Stefan Fuhrmann <stefan2@apache.org> | Sun Dec 01 19:37:30 2013 +0000 |
| committer | Stefan Fuhrmann <stefan2@apache.org> | Sun Dec 01 19:37:30 2013 +0000 |
| tree | 20e4a291685a524572f1eec22da194f18038473c | |
| parent | 47157aed75effbfa473ec6888840dfc8381b893a [diff] | |
| parent | 3f7057009409c3b7399fc60360bc112fc4275494 [diff] |
On the log-addressing branch: sync with the parent branch and resolve a few trivial conflicts. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/log-addressing@1546842 13f79535-47bb-0310-9956-ffa450edef68