Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: utils/Makefile.files		2014-01-10 17:41:52 +01:00
..
bootstrap	…
modules/org	create collections, v0.0.0	2014-01-07 16:28:12 +01:00
tests	…
client.js	…