* change changelog.
Merge branch 'master' of git@github.com:xirang/xirangeps