Checkout
cmpilato
committed
on 13 Jul 12
Sync the master-passphrase branch with trunk.
(Merged /subversion/trunk:r1354549-1361337.)