Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/V8Server/v8-vocbase.cpp		2014-08-07 16:12:14 +02:00
..
bootstrap	working on AQL function calls and error handling	2014-08-06 16:19:43 +02:00
modules	unify function behavior in shell and server	2014-08-05 09:07:28 +02:00
test-data	added empty remark	2014-05-08 11:18:08 +02:00
tests	reallow attribute names starting with underscores	2014-08-07 15:52:58 +02:00