Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding ... Conflicts: js/apps/system/aardvark/frontend/css/layout.css js/server/modules/org/arangodb/arango-collection.js		2014-02-12 12:53:08 +01:00
..
bootstrap	fixed unloadAll for system modules	2014-02-12 08:32:35 +01:00
modules	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-12 12:53:08 +01:00
test-data	made module loader more node compatible, added coffee script support	2014-02-11 13:26:11 +01:00
tests	Merge remote-tracking branch 'origin/devel' into sharding	2014-02-11 15:52:49 +01:00