1
0
Fork 0
Commit Graph

2 Commits

Author SHA1 Message Date
Frank Celler c0c869d1ff Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/ArangoShell/ArangoClient.cpp
	js/client/js-client.h
2012-10-13 16:28:09 +02:00
Jan Steemann cc371c4eb0 centralised and unified bye message 2012-10-12 21:46:58 +02:00