Michael Hackstein cff6bd9380 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: js/common/modules/org/arangodb/general-graph.js		2014-06-23 15:15:18 +02:00
..
bootstrap	fully removed replication logger	2014-06-21 00:32:47 +02:00
modules	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-06-23 15:15:18 +02:00
test-data	…
tests	excluded collection	2014-06-23 13:27:27 +02:00