Frank Celler 0236954f04 Merge branch 'devel' of github.com:triAGENS/ArangoDB ... Conflicts: html/admin/js/client.js html/admin/js/master.js		2012-05-23 11:44:40 +02:00
..
actions	renamed /document to /_api/document, /edge to /_api/edge	2012-05-22 16:04:20 +02:00
client	added skip list queries	2012-05-21 17:19:17 +02:00
common	fixed error message	2012-05-22 09:38:36 +02:00
server	added test cases	2012-05-23 00:13:33 +02:00