tree 9e862975ef4bfe4d21bc3a7d22aaf7adc076c0e8
parent 5fb55c2cf43f1e81fa951be5ffb64559d1720fe2
author Zhangxinguo <1245579343@qq.com> 1495794937 +0800
committer Zhangxinguo <1245579343@qq.com> 1495794937 +0800

Add back missing mereged codes.