Merge branch 'issue_4888' into master_tj

author TJ <acontent@iam.tj>

Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)

committer TJ <acontent@iam.tj>

Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)
author TJ <acontent@iam.tj>
Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)
committer TJ <acontent@iam.tj>
Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)
diff --cc home/ims/ims_import.php
Simple merge
diff --cc home/prog.php
Simple merge
author	TJ <acontent@iam.tj>
	Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)
committer	TJ <acontent@iam.tj>
	Fri, 21 Oct 2011 15:49:22 +0000 (16:49 +0100)
		1	2
home/ims/ims_import.php	patch \|	diff1 \|	diff2 \|	blob \| history
home/prog.php	patch \|	diff1 \|	diff2 \|	blob \| history