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
..
ArangoShell	issue #744	2014-01-23 09:58:18 +01:00
Benchmark	issue #744	2014-01-23 09:58:18 +01:00
V8Client	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-18 08:50:27 +01:00
CMakeLists.txt	removed check-server	2014-02-15 23:34:24 +01:00
Makefile.files	removed check-server	2014-02-15 23:34:24 +01:00