Merge pull request #822 from BoiteAWeb/master

author Cristi Burcă <scribu@gmail.com>

Mon, 28 Oct 2013 19:32:15 +0000 (12:32 -0700)

committer Cristi Burcă <scribu@gmail.com>

Mon, 28 Oct 2013 19:32:15 +0000 (12:32 -0700)
author Cristi Burcă <scribu@gmail.com>
Mon, 28 Oct 2013 19:32:15 +0000 (12:32 -0700)
committer Cristi Burcă <scribu@gmail.com>
Mon, 28 Oct 2013 19:32:15 +0000 (12:32 -0700)
diff --cc php/commands/post.php
Simple merge
diff --cc php/commands/scaffold.php
Simple merge
diff --cc php/utils.php
Simple merge
author	Cristi Burcă <scribu@gmail.com>
	Mon, 28 Oct 2013 19:32:15 +0000 (12:32 -0700)
committer	Cristi Burcă <scribu@gmail.com>
	Mon, 28 Oct 2013 19:32:15 +0000 (12:32 -0700)
		1	2
php/commands/post.php	patch \|	diff1 \|	diff2 \|	blob \| history
php/commands/scaffold.php	patch \|	diff1 \|	diff2 \|	blob \| history
php/utils.php	patch \|	diff1 \|	diff2 \|	blob \| history