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

This commit is contained in:
Dominik Schürmann 2015-01-27 13:04:09 +01:00
commit 9c6f195eb7

@ -1 +1 @@
Subproject commit 76d7b17f114ef180fdbe6852d8897e8b9a4bca8b
Subproject commit edcc61970f24bb3601af26d89f49d384e7a3aff6