Added nPercentile and keepLastValue
Workaround a behavior modification probably in grunt-string-replace
Merge pull request #208 from fstern/master

Added graphite functions: nPercentile and keepLastValue
fixed string replace issue that caused problems, this removes build cache busting in requirejs, will need to fix that later
Merge branch 'master' of github.com:torkelo/grafana
fixed karama tests
added phantomjs karma test to run in travis
Add logarithmic scale function
Merge pull request #212 from andrewmichaelsmith/log_func

Add logarithmic scale function
Adds support to have filters inside filters, (nested templated segments), Closes #128
Fix a "kibana" leftover in comments
Merge pull request #213 from jaimegago/master

Fix a "kibana" leftover in comments
make html-unsafe for text/html panels
make html-unsafe for text/html panels
Merge branch 'master' of github.com:bruce-lyft/grafana
added unit tests for filterSrv
more work on filterSrv unit tests
fixed build issues with last commit (spec file syntax error)
Added more query function in InfluxDB
Moved function definition out of template.