Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding ... Conflicts: arangod/V8Server/v8-vocbase.cpp		2014-01-21 09:29:45 +01:00
..
org	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding	2014-01-21 09:29:45 +01:00