Checkout
cmpilato
committed
on 07 Aug 12
On the 'master-passphrase' branch: sync with recent trunk changes.
(Merged /subversion/trunk:r1368649-1370241.)