Merge pull request #2564 from annando/1606-contact-handling
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 6 Jun 2016 04:06:21 +0000 (06:06 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 6 Jun 2016 04:06:21 +0000 (06:06 +0200)
Fix for mismatching avatars


Trivial merge