Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: Documentation/ImplementorManual/HttpSystem.md js/apps/system/aardvark/aardvark.js js/apps/system/aardvark/frontend/css/buttons.css js/server/version-check.js		2014-01-24 14:50:09 +01:00
..
arangodb	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-24 14:50:09 +01:00
arangodb.js	…