Jan Steemann 620274047f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions ... Conflicts: CHANGELOG		2014-11-20 14:23:01 +01:00
..
bootstrap	added several AQL functions	2014-11-18 11:26:42 +01:00
modules	jslinted	2014-11-20 09:53:50 +01:00
test-data	…
tests	added new graph function _connectingEdges	2014-11-19 09:26:40 +01:00