KylinOLAP/Kylin — pull request #257 by janzhongi (2014-12-23 09:09:19+00:00)
Title: merge local and staging

merge local and staging