deleted --gid X and --uid X
Merge branch '1.2' of github.com:triAGENS/ArangoDB into 1.2
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
generated files
Merge branch '1.2' of github.com:triAGENS/ArangoDB into devel