6 Commits

Author	SHA1	Message	Date
jsteemann	a6cb463e06	Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack	2016-01-05 00:25:10 +01:00
Frank Celler	1065a1bd2c	added work monitor	2016-01-04 15:33:06 +01:00
Jan Steemann	9ef5b4746a	removed several includes from Common.h	2015-11-25 12:21:55 +01:00
Jan Steemann	970c5a7e52	fixed SSL shutdown issue	2015-10-26 17:21:21 +01:00
CoDEmanX	3a9648d78a	More Americanization	2015-09-03 22:25:43 +02:00
Jan Steemann	9f0384284f	moved files	2015-08-19 11:19:37 +02:00