tree 592dcbba3dd6ae1e9dae9e5dcdc38a4df7b275a9
parent 9c98b339e952475d46b07df9ab1f401e793d2e9e
parent cd8ef832a9b275228e280f26bf8ab049d7965b22
author buyingyi <buyingyi@gmail.com> 1369973535 -0700
committer buyingyi <buyingyi@gmail.com> 1369973535 -0700

Merge branch 'master' into yingyi/fullstack_beta_fix