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	use `--data-binary` instead of `--data` in curl examples	2014-01-03 12:12:54 +01:00
modules/org	create collections, v0.0.0	2014-01-07 16:28:12 +01:00
tests	removed unused variables	2013-11-18 11:41:57 +01:00
client.js	fixed issue #701: ArangoStatement undefined in arangosh	2013-12-02 09:53:49 +01:00