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

This commit is contained in:
Dominik Schürmann
2015-01-14 00:04:10 +01:00
18 changed files with 698 additions and 102 deletions