tree 5deb64b1a1b12e05a47ad0a101aa8b2bd6e9ef47
parent f4e0d484b15f4264aef84017ff674655efe20854
parent a8f1f536abfecdb19fc7fe00a14dc1c38f4f3f11
author buyingyi <buyingyi@gmail.com> 1369429961 -0700
committer buyingyi <buyingyi@gmail.com> 1369429961 -0700

Merge branch 'yingyi/asterix_beta_fix'