Vincent Breitmoser ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize ...

Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle

2014-06-13 00:27:40 +02:00

..

src

Merge remote-tracking branch 'origin/master' into canonicalize

2014-06-13 00:27:40 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Merge remote-tracking branch 'origin/master' into canonicalize

2014-06-13 00:27:40 +02:00