Graylog2/graylog2-web-interface — pull request #80 by robertkowalski (2012-06-29 23:23:46+00:00)
Title: Bugfix: "Uncaught SyntaxError: Unexpected token :" &&  eval removal

Please test this resolved merge conflicts.

* Fixed bug that showed every few seconds in my chromium developer console
* removed evil eval
* Boyscouting: some missing semicolons and variable statements

Conflicts:

app/helpers/application_helper.rb
public/javascripts/application.js