Merge pull request #973 from SpikesDivZero/no-root

author Cristi Burcă <scribu@gmail.com>

Sun, 26 Jan 2014 11:47:20 +0000 (03:47 -0800)

committer Cristi Burcă <scribu@gmail.com>

Sun, 26 Jan 2014 11:47:20 +0000 (03:47 -0800)
author Cristi Burcă <scribu@gmail.com>
Sun, 26 Jan 2014 11:47:20 +0000 (03:47 -0800)
committer Cristi Burcă <scribu@gmail.com>
Sun, 26 Jan 2014 11:47:20 +0000 (03:47 -0800)
diff --cc php/WP_CLI/Runner.php
Simple merge
diff --cc php/config-spec.php
Simple merge
author	Cristi Burcă <scribu@gmail.com>
	Sun, 26 Jan 2014 11:47:20 +0000 (03:47 -0800)
committer	Cristi Burcă <scribu@gmail.com>
	Sun, 26 Jan 2014 11:47:20 +0000 (03:47 -0800)
		1	2
php/WP_CLI/Runner.php	patch \|	diff1 \|	diff2 \|	blob \| history
php/config-spec.php	patch \|	diff1 \|	diff2 \|	blob \| history