dianping/cat — pull request #431 by jialinsun (2014-08-04 03:15:06+00:00)
Title: chengjunxia bootcamp task modify & merge request

Has been tested ok.