Vincent Breitmoser 748049fb5b slightly change wording in merge logs

2014-10-25 02:50:48 +02:00

..

src/main

slightly change wording in merge logs

2014-10-25 02:50:48 +02:00

.gitignore

…

build.gradle

Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate

2014-09-24 02:01:53 +02:00