Merge branch 'master' of github.com:grafana/grafana

pkg/cmd/web.go

@@ -33,7 +33,7 @@ func newMacaron() *macaron.Macaron {
 	mapStatic(m, "css", "css")
 	mapStatic(m, "img", "img")
 	mapStatic(m, "fonts", "fonts")
-	mapStatic(m, "robots.txt", "robots.txxt")
+	mapStatic(m, "robots.txt", "robots.txt")
 
 	m.Use(macaron.Renderer(macaron.RenderOptions{
 		Directory:  path.Join(setting.StaticRootPath, "views"),