Jan Steemann c034307dca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Utils/CollectionNameResolver.h		2014-09-10 15:54:49 +02:00
..
bootstrap	Replaced PBKDF2_HMAC with PBKDF2_HMAC_SHA1 for OSX compat.	2014-09-08 14:32:40 +02:00
modules	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-09-10 15:54:49 +02:00
test-data	added empty remark	2014-05-08 11:18:08 +02:00
tests	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel	2014-09-10 15:50:28 +02:00