merge 0.6.7 to master

This commit is contained in:
Liang Ding
2014-10-16 17:57:04 +08:00
28 changed files with 28 additions and 1296 deletions

File diff suppressed because one or more lines are too long