Add faq entry for keyserver bug, closes #552
Merge branch 'master' of github.com:open-keychain/open-keychain
Remove dev hack in KeychainDatabase
Remove kill hack in KeychainDatabase
changelog 2.6
OK 2.6 RC1
Fix upload of keys, closes #581
FIx nfc button
Small language corrections (thanks to yahoe.001)
Do not show lookup button in decrypt activity for decryption-only
Translations from transifex
Remove unused strings, fix some lint errors, fix some language confusions
Update maven libs and use fixed version
fix unified query columns for select*fragment
Update from transifex
certify keys
Fix more strings
Fix some smaller annoyances, closes #583, #582
Trying a fix for #585
better error string for too many responses