Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel ... Conflicts: Documentation/Examples/shell-read-document-bad-handle Makefile.in arangod/Documentation/shell-document.dox configure js/actions/system/api-collection.js js/actions/system/api-index.js js/actions/system/api-system.js js/common/bootstrap/modules.js js/common/bootstrap/print.js js/server/ArangoCollection.js lib/V8/v8-utils.cpp		2013-01-09 15:30:21 +01:00
..
org	Merge remote-tracking branch 'origin/1.1' into devel	2013-01-09 15:30:21 +01:00
simple-query.js	more tests and documentation for fulltext indexes	2012-12-05 16:12:33 +01:00