Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: arangod/VocBase/document-collection.c arangosh/CMakeLists.txt js/apps/system/aardvark/test/karma/karma.conf.js		2014-02-18 08:50:27 +01:00
..
system/aardvark	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00