jcj83429 2cff2aaa66 Merge upstream 'master' into u2f ...

Conflicts:
	lib/config/fileconf.go
	tool/tsh/main.go

2016-10-24 00:08:26 -07:00

..

tctl

Merge branch 'master' into ev/standalone

2016-10-14 00:11:41 -07:00

teleport

Nicer parsing of "auth_servers" config option

2016-06-12 16:30:32 -07:00

tsh

Merge upstream 'master' into u2f

2016-10-24 00:08:26 -07:00