Merge pull request #1875 from GOLinux/master

[Translated] 20141021 Configuring layer-two peer-to-peer VPN using n2n.md
Merge branch 'master' of https://github.com/LCTT/TranslateProject.git