change the way merging is logged
Merge branch 'development' of github.com:open-keychain/open-keychain into development
slightly change wording in merge logs