Merge branch 'development' into linked-identities

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

1 files changed, 0 insertions, 8 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
index 8f10377cd..20dba95e9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
@@ -505,10 +505,6 @@ public class ImportExportOperation extends BaseOperation {
                 // Create an output stream
                 try {
                     arOutStream = new ArmoredOutputStream(outStream);
-                    String version = PgpHelper.getVersionForHeader(mContext);
-                    if (version != null) {
-                        arOutStream.setHeader("Version", version);
-                    }
 
                     log.add(LogType.MSG_EXPORT_PUBLIC, 1, KeyFormattingUtils.beautifyKeyId(keyId));
 
@@ -533,10 +529,6 @@ public class ImportExportOperation extends BaseOperation {
                 if (exportSecret && cursor.getInt(3) > 0) {
                     try {
                         arOutStream = new ArmoredOutputStream(outStream);
-                        String version = PgpHelper.getVersionForHeader(mContext);
-                        if (version != null) {
-                            arOutStream.setHeader("Version", version);
-                        }
 
                         // export secret key part
                         log.add(LogType.MSG_EXPORT_SECRET, 2, KeyFormattingUtils.beautifyKeyId(keyId));