issue #997: added large file support for Windows
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
CPP-i-fy the printf for the nice error message.
Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2
updated CHANGELOG
issue #1016: AQL editor bug
Finalize the remove unnecessary calculation tests.
create verbose plans
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
changed return value of applicationContext.collectionName

Now, a valid collection name is always returned, even if the application name prefix contains invalid characters
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
added optimizer rule test
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into mmh