| commit | e7b314ef511abc5c8a6d50c22c83f72c781551c9 | [log] [tgz] |
|---|---|---|
| author | C. Michael Pilato <cmpilato@apache.org> | Mon Aug 13 17:23:25 2012 +0000 |
| committer | C. Michael Pilato <cmpilato@apache.org> | Mon Aug 13 17:23:25 2012 +0000 |
| tree | 4bcb58625f5c37fa0b1186ce0a1c40e4613719cf | |
| parent | 2f9191b5b387f6de33bbc78ad5d4af8d84874b0b [diff] |
On the '1.7.x-r1242759' branch: merge from trunk r1242759, r1242770, and r1242794, resolving the conflict caused by gpg_agent.c not existing in the 1.7.x history. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1242759@1372524 13f79535-47bb-0310-9956-ffa450edef68