Jan Steemann 528ec17bcd Merge branch 'devel' of https://github.com/arangodb/arangodb into hash-collect ... Conflicts: arangod/FulltextIndex/fulltext-handles.cpp		2015-04-16 19:06:21 +02:00
..
org	Merge branch 'devel' of https://github.com/arangodb/arangodb into hash-collect	2015-04-16 19:06:21 +02:00