tree 56d2f55eb411074cc8a02566053b10af3d14e27e
parent 209adfbb01fdf02033d35ebcc07f669d27bcc349
parent 483fb87d34cef126204619473d8992193f82cb6d
author buyingyi <buyingyi@gmail.com> 1370294516 -0700
committer buyingyi <buyingyi@gmail.com> 1370294516 -0700

Merge branch 'master' into yingyi/asterix_beta_fix