tree 811cb43be3b49b8f48b9ffd520024822cd41f184
parent f07495bfd1e442868c3087ca8f23db46bcce543f
parent 62f2d38e36d9be3623f2bad16f39d4bf3fa9d098
author buyingyi <buyingyi@gmail.com> 1370479362 -0700
committer buyingyi <buyingyi@gmail.com> 1370479362 -0700

Merge branch 'master' into yingyi/asterix_beta_fix