Commit Graph
1 Commits
Author SHA1 Message Date
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