Miroslav Bajtoš d5cd0a3b50 Merge branch 'master' into 2.0 ... Conflicts: README.md docs/configuration.md lib/executor.js package.json Changes in the docs were merged manually and updated to correctly describe the 2.x layout.		2014-06-26 14:40:24 +02:00
..
migrating-from-1x-to-2x.md	Merge branch 'master' into 2.0	2014-06-26 14:40:24 +02:00