tree 40d8b7323cac3d2697c8ad02880ea9126eaa3285
parent d11c61cd11ac34f98ee0627e3efcd22f03addcbf
parent 1ba53e7eef4158eab9b00b5711a42b53a94b685c
author buyingyi <buyingyi@gmail.com> 1381343200 -0700
committer buyingyi <buyingyi@gmail.com> 1381343200 -0700

Merge branch 'master' into yingyi/asterix_fix