Michael Hackstein e942f6252d Merge branch 'devel' of github.com:arangodb/arangodb into devel ... Conflicts: js/apps/system/_admin/aardvark/APP/test/specs/views/documentViewSpec.js		2015-03-16 15:04:37 +01:00
..
_admin/aardvark/APP	Merge branch 'devel' of github.com:arangodb/arangodb into devel	2015-03-16 15:04:37 +01:00
_api/gharial/APP	…
_system	fixed "line too long"	2015-03-10 14:44:31 +01:00