Jan Steemann a70a9613f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: lib/BasicsC/voc-errors.h		2014-08-22 21:51:38 +02:00
..
bootstrap	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-22 21:51:38 +02:00
modules	need to ALWAYS create a new environment. Otherwise results are somewhat non-deterministic	2014-08-15 17:35:46 +02:00
test-data	added empty remark	2014-05-08 11:18:08 +02:00
tests	Keep legacy users API backwards-compatible.	2014-08-20 14:19:08 +02:00