tree 31f16cb62d845173e8152e950bb5b3e382496c1f
parent c9df3d191619909e501202669572db02be166064
parent b71c52fd2dbc2a8f8f0859dec08136530dac7bd5
author buyingyi <buyingyi@gmail.com> 1370479838 -0700
committer buyingyi <buyingyi@gmail.com> 1370479838 -0700

Merge branch 'yingyi/asterix_beta_fix'