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