Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: js/apps/system/aardvark/frontend/css/layout.css js/server/modules/org/arangodb/arango-collection.js		2014-02-12 12:53:08 +01:00
..
arangodb	removed deprecated options	2014-02-11 15:54:48 +01:00
relative	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-12 12:53:08 +01:00
systemd	fixed wrong user	2013-12-26 18:43:57 +01:00
Makefile.files	arangod used same config as binary name	2013-12-21 01:36:25 +01:00