James Strachan 8bee1a5bcf Merge branch 'master' of https://github.com/hawtio/hawtio-kubernetes ... # Conflicts: # dist/hawtio-kubernetes.js		2016-05-17 12:36:32 +01:00
..
ts	Merge branch 'master' of https://github.com/hawtio/hawtio-kubernetes	2016-05-17 12:36:32 +01:00