tree fd6c083f5d3b6f4239ba461c64d210868aa590fa
parent acec1376135c6c6fc7dccbb2287ac86bff77d873
parent 20c5e432ac3741331d7a5f5cfd201641e7093180
author buyingyi <buyingyi@gmail.com> 1375930242 -0700
committer buyingyi <buyingyi@gmail.com> 1375930242 -0700

Merge branch 'yingyi/asterix_fix'