Merge changes from topic 'smtp-passwords-from-imap'
commit942de0cf5730ca01a61ea8d3d7291e0f240ec89f
authorJan Kundrát <jkt@kde.org>
Fri, 8 Jan 2016 09:37:02 +0000 (8 10:37 +0100)
committerGerrit Code Review <noreply@kde.org>
Fri, 8 Jan 2016 09:37:03 +0000 (8 10:37 +0100)
treee65b7ad68ab8d832435e551fc3a8b67d0e0ea16c
parentfbd233b2ceb6e161054a6dc0a1c0e6ad356c51f9
parentdc25c69865bf7156aad78393683751c57482d0b6
Merge changes from topic 'smtp-passwords-from-imap'

* changes:
  Enable reusing IMAP credentials for SMTP
  Fix copyright year
  GUI: Settings: remove duplicate connections