tree f20f5d8920cc5e41a898089618eab01cb5106ed4
parent b5c02192d4b6d751a2870e12c5b02de87a1a99b0
parent 3bfa896f2424e5c2c2c791c6a50b4b10a7657b56
author buyingyi <buyingyi@gmail.com> 1370035819 -0700
committer buyingyi <buyingyi@gmail.com> 1370035819 -0700

Merge branch 'yingyi/fullstack_beta_fix'