Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel ... Conflicts: arangosh/V8Client/arangosh.cpp bin/arango32.msi bin/arango64.msi lib/BasicsC/win-utils.c		2013-01-15 15:50:47 +01:00
..
ArangoClient.cpp	Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel	2013-01-15 15:50:47 +01:00
ArangoClient.h	issue #353	2013-01-15 14:35:05 +01:00