tree f5268bb2da446e71a51d20437cbe80393e18b0a9
parent 0396f27e690ec1aa226033d3d27e6a488a38e81d
parent 75b8ad23741f3282d37ef6fc995aedd56f52aa60
author buyingyi <buyingyi@gmail.com> 1368470842 -0700
committer buyingyi <buyingyi@gmail.com> 1368470842 -0700

Merge branch 'master' into yingyi/asterix_beta_fix