Merge branch 'master' of http://github.com/sosahvictor/cordova-docs
Merge remote-tracking branch 'origin/master'