Checkout
cmpilato
committed
on 01 Mar 13
Sync the 'master-passphrase' branch with trunk changes. This is gonna
hurt a little bit. (Merged /subversion/trunk:r1403824-1451628.)