tree 6a0fc7fde55f483d76caa031c02c58e50723cfdd
parent ddd2f948d2c347e3005680b8330bfd74457cdaa3
parent cf8f054d149fd0dc24cb6f6c81f94e65334a4226
author buyingyi <buyingyi@gmail.com> 1379725695 -0700
committer buyingyi <buyingyi@gmail.com> 1379725695 -0700

Merge branch 'master' into yingyi/asterix_fix