Merge pull request #665 from wp-cli/no-dev-deps

author Cristi Burcă <scribu@gmail.com>

Mon, 12 Aug 2013 20:50:25 +0000 (13:50 -0700)

committer Cristi Burcă <scribu@gmail.com>

Mon, 12 Aug 2013 20:50:25 +0000 (13:50 -0700)
author Cristi Burcă <scribu@gmail.com>
Mon, 12 Aug 2013 20:50:25 +0000 (13:50 -0700)
committer Cristi Burcă <scribu@gmail.com>
Mon, 12 Aug 2013 20:50:25 +0000 (13:50 -0700)
diff --cc composer.json
Simple merge
diff --cc features/bootstrap/FeatureContext.php
Simple merge
author	Cristi Burcă <scribu@gmail.com>
	Mon, 12 Aug 2013 20:50:25 +0000 (13:50 -0700)
committer	Cristi Burcă <scribu@gmail.com>
	Mon, 12 Aug 2013 20:50:25 +0000 (13:50 -0700)
		1	2
composer.json	patch \|	diff1 \|	diff2 \|	blob \| history
features/bootstrap/FeatureContext.php	patch \|	diff1 \|	diff2 \|	blob \| history