Daniel Albert df9af316b4 Merge branch 'master' of https://github.com/open-keychain/open-keychain		2014-06-30 19:09:56 +02:00
..
src	Merge branch 'master' of https://github.com/open-keychain/open-keychain	2014-06-30 19:09:56 +02:00
.gitignore
build.gradle	Merge pull request #686 from mar-v-in/minidns	2014-06-23 23:16:25 +02:00