Frank Celler 36da27ac6f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: Documentation/DbaManual/Authentication.md Documentation/DbaManual/UserManagementTOC.md js/common/modules/org/arangodb/users.js		2013-02-20 13:52:20 +01:00
..
bootstrap	issue #393, issue #128	2013-02-20 11:56:26 +01:00
modules	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2013-02-20 13:52:20 +01:00
test-data	Removed some unnecessary files	2012-08-15 00:55:25 +02:00
tests	issue #393, issue #128	2013-02-20 11:56:26 +01:00