qipost/branch-merge — pull request #3 by lawrenceqin (2012-10-13 03:24:26+00:00)
Title: Update upstream

* Add feature 7