no proxy
Merge branch 'master' of github.com:Manishearth/Moodle-Sync-2