commit 1e81f8ecfc737674705fac7e0d85dc2206519b38 Merge: 28c5fc48e dac3cb15c Author: Torkel Ödegaard <torkel.odegaard@gmail.com> Date: Thu Oct 2 12:26:20 2014 +0200 Merge branch 'master' of github.com:torkelo/grafana-private into pro
