commit 4f798cfe568db2491fe5eea3f06ddd3027117e90 Merge: d8ea970f1 bba3f3000 Author: Torkel Ödegaard <torkel.odegaard@gmail.com> Date: Wed Sep 17 13:35:19 2014 +0200 Merge branch 'master' of github.com:torkelo/grafana-private into pro