Frank Celler 87dedac607 Merge remote branch 'origin/mruby' ... Conflicts: .gitignore		2012-04-22 09:21:39 +02:00
..
actions	Merge branch 'master' of github.com:triAGENS/AvocadoDB	2012-04-20 15:03:21 +02:00
client	renamed .delete to .remove or .DELETE to avoid JS lint errors	2012-04-18 17:09:04 +02:00
common	fixed unit tests	2012-04-21 18:39:36 +02:00
server	Merge remote branch 'origin/mruby'	2012-04-22 09:21:39 +02:00