tree f7d1b8848f9f465f851140243f80daab26525f37
parent 7e6baacb6094c886ab898b09fbe81487443f3f8a
parent 79194d0704a3c923052be9720d92d8699baf50fc
author buyingyi <buyingyi@gmail.com> 1383851873 -0800
committer buyingyi <buyingyi@gmail.com> 1383851873 -0800

Merge branch 'yingyi/fullstack_fix'