tree 827f9d95ed2b9896fca779850c6f6491a2907417
parent dc687e0cd736ddd0f9bd84921653f848ff77ae94
parent 982e30ca7b64f188a2d18c1ed980b5b542280009
author buyingyi <buyingyi@gmail.com> 1369079339 -0700
committer buyingyi <buyingyi@gmail.com> 1369079339 -0700

Merge branch 'yingyi/fullstack_beta_fix'