merge master into multisite-install branch

author scribu <mail@scribu.net>

Tue, 23 Jul 2013 23:16:24 +0000 (02:16 +0300)

committer scribu <mail@scribu.net>

Tue, 23 Jul 2013 23:16:24 +0000 (02:16 +0300)
author scribu <mail@scribu.net>
Tue, 23 Jul 2013 23:16:24 +0000 (02:16 +0300)
committer scribu <mail@scribu.net>
Tue, 23 Jul 2013 23:16:24 +0000 (02:16 +0300)
diff --cc php/WP_CLI/Runner.php
Simple merge
diff --cc php/commands/core.php
Simple merge
diff --cc php/utils.php
Simple merge
author	scribu <mail@scribu.net>
	Tue, 23 Jul 2013 23:16:24 +0000 (02:16 +0300)
committer	scribu <mail@scribu.net>
	Tue, 23 Jul 2013 23:16:24 +0000 (02:16 +0300)
		1	2
php/WP_CLI/Runner.php	patch \|	diff1 \|	diff2 \|	blob \| history
php/commands/core.php	patch \|	diff1 \|	diff2 \|	blob \| history
php/utils.php	patch \|	diff1 \|	diff2 \|	blob \| history