Checkout
cmpilato
committed
on 12 Sep 12
Bring the 'master-passphrase' branch into sync with recent trunk changes.
(Merged /subversion/trunk:r1372418-1383954.)