tree 3eb01de511b816c57f14d97889279288d477e444
parent 467830ccb7379ed62c1be557c8c7650cd7d1d66a
parent 6682898e84ae496c9af9e6edc3c6a7a69211cd24
author buyingyi <buyingyi@gmail.com> 1368332778 -0700
committer buyingyi <buyingyi@gmail.com> 1368332778 -0700

Merge branch 'master' into yingyi/asterix_beta_fix