Merge changes from topic 'crypto-offline'
commit1d50d514061ffb4be2141ccefd63350625cb1d61
authorJan Kundrát <jkt@kde.org>
Mon, 20 Jun 2016 09:33:30 +0000 (20 11:33 +0200)
committerGerrit Code Review <noreply@kde.org>
Mon, 20 Jun 2016 09:33:31 +0000 (20 11:33 +0200)
tree55ea048823754203a05bdfc10f6a78306737fad2
parentee91935933d0c581566fddfcdc1dc6f6512b4ebb
parent4a2be72161eabf72a76ba7af49a1d22b98815e1c
Merge changes from topic 'crypto-offline'

* changes:
  Fix compilation with -DMIME_TREE_DEBUG
  tests: fix out-of-build-dir invocation
tests/Cryptography/test_Cryptography_PGP.cpp