乱了
Merge branch 'master' of https://github.com/reeze/tipi into develop

Conflicts:
	book/chapt08/08-03-zend-thread-safe-in-php.markdown
	book/index.markdown
Merge branch 'master' of https://github.com/reeze/tipi into develop
格式错误
no message
修改hash_table resize 示例代码中的错误
Add index
Merge pull request #51 from liaohuqiu/master

修改hash_table resize 示例代码中的错误
Update main.c
Typo fix
Merge branch 'master' of github.com:reeze/tipi

* 'master' of github.com:reeze/tipi:
  Update main.c
  修改hash_table resize 示例代码中的错误
Add re2c mannal
modify re2c manual
modify text
Add type
fix a typo: sprrintf => spprintf
Merge pull request #53 from sdpfoue/master

修改一个笔误
Merge branch 'master' of https://github.com/reeze/tipi into develop
Merge branch 'release' of https://github.com/reeze/tipi

Conflicts:
	book/D-how-to-contribute.markdown
	book/chapt05/05-09-spl.markdown