rsafronov 05526e4a66 Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers ... # Conflicts: # controllers/nginx/pkg/template/template.go		2017-03-02 14:46:18 -05:00
..
nginx	Merge remote-tracking branch 'upstream/master' into nginx/extauth_headers	2017-03-02 14:46:18 -05:00