release version 2.3.0-alpha1
jshint version
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3
release version 2.3.0-alpha2
release version 2.3.0-alpha3
Merge branch 'aql2' of github.com:triAGENS/ArangoDB into 2.3

Conflicts:
	config/generateErrorfile.py
auto-generated files
release version 2.3.0-alpha4
jslint fixes
release version 2.3.0-alpha5
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3

Conflicts:
	VERSION
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/explain.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/query.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/transaction.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/user.json
	js/apps/system/aardvark/api-docs/version.json
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/testing.js
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3
release version 2.3.0-alpha6
removed EXPERIMENTAL
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3

Conflicts:
	configure.ac
added 2.3 branch
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3
release version 2.3.0-alpha7
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3
release version 2.3.0-beta1