Frank Celler 8dbdf55165 Merge remote-tracking branch 'origin/1.4' into devel ... Conflicts: CHANGELOG arangosh/ArangoShell/ArangoClient.cpp		2013-12-30 17:27:17 +01:00
..
ArangoShell	Merge remote-tracking branch 'origin/1.4' into devel	2013-12-30 17:27:17 +01:00
Benchmark	added --server.ssl-protocol option for client tools	2013-12-13 17:58:24 +01:00
V8Client	merged changes from 1.4 back to devel	2013-12-27 14:59:23 +01:00
CMakeLists.txt	merged changes from 1.4 back to devel	2013-12-27 14:59:23 +01:00
Makefile.files	added check-sever	2013-11-20 09:21:22 +01:00