Smaugs Einoede
Merge branch 'lmmh' of github.com:triAGENS/ArangoDB into lmmh