jsteemann c2768d5a86 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel		2016-06-06 22:33:01 +02:00
..
ApplicationFeatures	fixed progation of kill	2016-06-06 17:08:37 +00:00
Basics	merge with velocypack	2016-06-06 16:59:36 +02:00
Endpoint	…
JsonParser	…
Logger	added unprepare	2016-06-06 18:27:51 +02:00
ProgramOptions	Fix reference of string	2016-06-03 15:12:44 +02:00
Random	…
Rest	merge with velocypack	2016-06-06 16:59:36 +02:00
SimpleHttpClient	…
Ssl	added unprepare	2016-06-06 18:27:51 +02:00
Utilities	…
V8	merge with velocypack	2016-06-06 16:59:36 +02:00
Zip	…
CMakeLists.txt	merge with velocypack	2016-06-06 16:59:36 +02:00