tree bafee3cd22fcee80f33567be56b036005658205c
parent ba2e458e16b9b571740cca1daf1960fdcfc1bb1c
parent f2f8a13a8e019f3b1d226097c4a4808c0b265ba3
author buyingyi <buyingyi@gmail.com> 1375489386 -0700
committer buyingyi <buyingyi@gmail.com> 1375489386 -0700

Merge branch 'master' into yingyi/fullstack_fix