tree c061148808a2d0bac222ee1e88b776646e07a5d5
parent e32223e164a37b0ce6e216f04b09df2bf9f4319c
parent 1713d1a09f6e9c72ee0dec5791010fd50631d599
author buyingyi <buyingyi@gmail.com> 1368563121 -0700
committer buyingyi <buyingyi@gmail.com> 1368563121 -0700

Merge branch 'yingyi/fullstack_beta_fix'