First draft of PMASA-2014-10
Fix small typos

Signed-off-by: Marc Delisle <marc@infomarc.info>
Update with commit hashes

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge branch 'master' of github.com:phpmyadmin/website