encore et amend
Merge branch 'master' of https://github.com/fanfansama/tpgit

* 'master' of https://github.com/fanfansama/tpgit:
  encore et amend