Files
fdroidclient/src
Peter Serwylo c1ccdcfca8 Merge branch 'master' into development
Conflicts:
	src/org/fdroid/fdroid/DB.java
	src/org/fdroid/fdroid/FDroid.java
	src/org/fdroid/fdroid/RepoXMLHandler.java
2014-01-06 15:05:37 +11:00
..