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