tree 8524ad8839e1e2429e568dee196ad464c9757df1
parent 38ff45c29152b14ad635b8de7682aa058b5cbda9
parent c15b843b3c60cbc0afa2735bafdda93755e2057b
author buyingyi <buyingyi@gmail.com> 1375468822 -0700
committer buyingyi <buyingyi@gmail.com> 1375468822 -0700

Merge branch 'master' into yingyi/asterix_fix