12
Merge branch 'master' of https://github.com/yongbaolinux/framework

Conflicts:
	framework/2014-12-06.log
	framework/test.php
12
12Merge branch 'master' of https://github.com/yongbaolinux/framework

Conflicts:
	framework/2014-12-08.log
	framework/drivers/db/mysql/driver.php
	framework/test.php