2 Commits

Author	SHA1	Message	Date
Jan Steemann	369433f1e2	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel ... Conflicts: arangosh/Benchmark/BenchmarkThread.h lib/SimpleHttpClient/SimpleHttpClient.cpp	2013-09-05 12:34:45 +02:00
Frank Celler	05a70a236f	converting .dox to .md	2013-02-06 18:05:45 +01:00