commit 373118c5eecc5c3645254cb4b862124b55dae980 Merge: 634d8c997 846cf934f Author: Torkel Ödegaard <torkel.odegaard@gmail.com> Date: Mon Dec 15 16:17:59 2014 +0100 Merge branch 'master' of github.com:torkelo/grafana-private into pro
