tree ab001d34d7f6aff49059a736af43cb73a1c97501
parent 59d4e88404c856a73258fa433c2d5e466d39e312
parent 4abf8666b5037cbaf0cb3549b82698d17aa48fc5
author buyingyi <buyingyi@gmail.com> 1379725872 -0700
committer buyingyi <buyingyi@gmail.com> 1379725872 -0700

Merge remote-tracking branch 'origin' into yingyi/fullstack_fix