JSLint
Merge branch 'devel' of github.com:triagens/arangodb into devel