ddd
Merge branch 'master' of https://github.com/ziphirum/tangmoman

Conflicts:
	srwo/class.php