tree 23d8f3b3cf90f84464ac614c4d9d4d4196399f45
parent 5fb55c2cf43f1e81fa951be5ffb64559d1720fe2
parent c7c139a738f052ad9d1731cd32bf43f7b3a946d1
author Chris Cao <caohaoch@gmail.com> 1495853764 +0800
committer GitHub <noreply@github.com> 1495853764 +0800

Merge pull request #340 from Zhangxinguo/master

Add back missing mereged codes.