mod in original
Merge remote-tracking branch 'remotes/origin/t1'

Conflicts:
	i.php
t2
Merge remote-tracking branch 'remotes/origin/t2'
PRQ
Merge pull request #1 from wzsolt/master

pull this down