tree 483180a790849c9050d7fd6187f1a9bd53225c52
parent cca6566f23e9a91637c1ff5c8b6896ab1cf939a5
parent b9411d875300b0c526573ae827ce281df3fd277a
author buyingyi <buyingyi@gmail.com> 1369176954 -0700
committer buyingyi <buyingyi@gmail.com> 1369176954 -0700

Merge branch 'master' into yingyi/asterix_beta_fix