tree 14a3be4cf85738f0b96c4c204137e7a6af4cc096
parent a6bdfc9462074dbe9b9429de1c1cf6a6a90c0a4e
parent 7a7795becfbcfe343fe76cee32f61ae7aa3300a4
author buyingyi <buyingyi@gmail.com> 1383462045 -0700
committer buyingyi <buyingyi@gmail.com> 1383462045 -0700

Merge branch 'master' into yingyi/fullstack_fix