tree 2f01cf883454debc7845409c96821cc542522f9f
parent 9a430b250378d62b332fd0ca7990d6ed3be5caf2
parent 91525f3ffbf61e3270770b90d20df8407e745f38
author buyingyi <buyingyi@gmail.com> 1368203731 -0700
committer buyingyi <buyingyi@gmail.com> 1368203731 -0700

Merge branch 'yingyi/asterix_beta_fix'