Merge pull request #425 from rashidkpc/master

Fixing silly conflict

panels/histogram/module.js

@@ -618,4 +618,4 @@ angular.module('kibana.histogram', [])
     return result;
   };
 
-});
+});