Vincent Breitmoser 40703fe961 Merge branch 'master' into development ... Conflicts: OpenKeychain/src/main/res/values/strings.xml		2015-05-28 16:37:15 +02:00
..
java/org/sufficientlysecure/keychain	Merge branch 'master' into development	2015-05-28 16:37:15 +02:00
resources	fix and test for bad certificate version numbers (#1012)	2015-01-02 01:58:16 +01:00