strategy git-rebase is enabled
Merge pull request #59 from juanda/master

strategy git-rebase is enabled