-tt
Merge branch 'master' of https://github.com/huangguisu/bitiming

Conflicts:
	config/data/Attrtype.php