Merge changes from topic 'crypto-unavailable-part-data'
commitfd80835c1b83bcad9d5980530fa526907ac22a59
authorJan Kundrát <jkt@kde.org>
Mon, 24 Oct 2016 13:12:13 +0000 (24 15:12 +0200)
committerGerrit Code Review <noreply@kde.org>
Mon, 24 Oct 2016 13:12:13 +0000 (24 15:12 +0200)
treef2dd0522fb051352e5d21453f7d852d5f9e46b5e
parent3e4a690a5679779073c492d4cd2c592b89d171ad
parentd53a5328a7c7b1909c09814883d5f571a51199c4
Merge changes from topic 'crypto-unavailable-part-data'

* changes:
  Crypto: fix assert failure
  Do not use misleading parameter names