passwd recov: short note on url and a minor fix
Merge branch 'aaa'
version bump 2013.10.02
Merge branch 'master' into margay

Release 2013.10.02.