Files
open-keychain/src/org/thialfihar/android/apg
Markus Doits 1b7fbb1eeb Update to latest version in master
Merge branch 'master' into apg_service

Conflicts:
	src/org/thialfihar/android/apg/Apg.java
	src/org/thialfihar/android/apg/Preferences.java
2011-11-03 20:14:24 +01:00
..
2011-06-05 19:47:41 +00:00
2011-11-03 20:14:24 +01:00
2010-09-12 19:06:26 +00:00