Merge branch 'master' of github.com:open-keychain/open-keychain

This commit is contained in:
Dominik Schürmann 2017-02-10 08:56:18 +01:00
commit 5987b6db26

@ -1 +1 @@
Subproject commit c6baf2bc5f6afd00305d1a356dd3eef2f8f70fba
Subproject commit cbc5622b95253b985c2207f493eff220a02d7258