tree 882cf5ddbae169566c44db3e2c8021f0a9779231
parent 54151ae2c20e8e2866cfc6f47dc16c18e2b8e22b
parent f253c8699876dea37d8d89daa3042f8058ada523
author buyingyi <buyingyi@gmail.com> 1370331702 -0700
committer buyingyi <buyingyi@gmail.com> 1370331702 -0700

Merge branch 'master' into yingyi/asterix_beta_fix