delete superfluous environment variables
Merge pull request #124 from fundon/delete-superfluous-variable

delete superfluous environment variables
Merge branch 'master' of github.com:gogits/gogs into dev
bug fixed
Merge branch 'dev' of github.com:gogits/gogs into dev
Fix #102
Fixed codename match issue, when using `FROM ubuntu` wil be pulled latest image
Merge pull request #132 from fundon/fix_codename_match

Fixed codename match issue, when using `FROM ubuntu` wil be pulled latest image
Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	modules/base/conf.go