deleted --gid X and --uid X
Merge branch '1.2' of github.com:triAGENS/ArangoDB into devel
removed generated files
Merge branch '1.2' of github.com:triAGENS/ArangoDB into devel
fixed typo
 footer
footer
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
 aboutview
fixed typo in comment
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
fixed version number
added fix for TRI_ENABLE_LOGGING from Jan
fixed some typos
moved arangod.conf
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
bugfix #410: Graph REST API returns "400:Bad request" instead of "404:Not found"
changed default
changed version to 1.2.devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel