Peter Serwylo 3731ed8f23 Merge remote-tracking branch 'upstream/master' into improvement/16/manage-repos
Conflicts:
	res/values/strings.xml
	src/org/fdroid/fdroid/DB.java
	src/org/fdroid/fdroid/ManageRepo.java
	src/org/fdroid/fdroid/RepoXMLHandler.java
	src/org/fdroid/fdroid/Utils.java
2014-01-04 20:45:52 +11:00
..
2013-11-16 23:39:37 +01:00
2013-12-12 10:50:01 +11:00
2013-12-31 11:03:34 +01:00
2013-12-31 11:03:34 +01:00