change changelog
Merge pull request #25 from wangjeaf/master

Auto merge by kpm server