Jan Steemann 1c990b7324 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions ... Conflicts: arangod/Aql/ExecutionNode.cpp		2015-10-05 10:32:36 +02:00
..
bootstrap	restore 2.6 behavior for db-based modules	2015-10-01 10:51:23 +02:00
modules	Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions	2015-10-05 10:32:36 +02:00
test-data	Fixed shell-require test	2015-09-24 13:46:14 +02:00
tests	fix jslint: remove unused variable	2015-09-25 13:50:29 +02:00