On the gpg-agent-password-store branch, remerge (that is, reverse-merge
and then merge again) r1146165, r1146496, r1146501. For some reason the
right set of changes was not merge into this branch when these revisions
were originally merged.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/gpg-agent-password-store@1150760 13f79535-47bb-0310-9956-ffa450edef68
1 file changed