commit e0dc530e943d52453aa06fc47596d3f6f0261f2c Merge: 639a44d99 af52b20c4 Author: Torkel Ödegaard <torkel.odegaard@gmail.com> Date: Sun Sep 21 08:25:54 2014 +0200 Merge branch 'master' of github.com:torkelo/grafana-private into pro