Torkel Ödegaard d9096110f8 Merge branch 'master' into alerting %!s(int64=9) %!d(string=hai) anos
..
grafana-cli af216ecf83 tech(cli): remove loop and head straight for plugindir %!s(int64=9) %!d(string=hai) anos
grafana-server 0667d73660 Merge branch 'new-logger' into alerting_definitions %!s(int64=9) %!d(string=hai) anos