Checkout
cmpilato
committed
on 25 Jul 12
Sync the 'master-passphrase' branch with recent trunk changes.
(Merged /subversion/trunk:r1363893-1365671)