Ev Kontsevoy 0d476caae7 Merge branch 'master' into ev/183 ... Conflicts: lib/auth/api_with_roles.go		2016-03-01 18:33:26 -08:00
..
cfg.go	Added --advertise-ip flag to teleport server	2016-03-01 18:24:20 -08:00
cfg_test.go	Better "sample config" implementation	2016-02-23 23:42:36 -08:00
service.go	Merge branch 'master' into ev/183	2016-03-01 18:33:26 -08:00
supervisor.go	Got the basics done for 'teleport'	2016-02-07 23:35:34 -08:00
tpl.go	Properly vendored dependencies	2016-02-22 14:11:31 -08:00