Peter Serwylo 82af6fc60e Merge branch 'master' into improvement/16/manage-single-repo ...

Phew, monster merge. Going to commit after *seemingly* resolving
conflicts, but it will no doubt take a few compile and runs to sort out
any funny stuff.

Conflicts:
	AndroidManifest.xml
	res/layout/addrepo.xml
	res/layout/appdetails.xml
	res/layout/repolisticons.xml
	res/values/strings.xml
	src/org/fdroid/fdroid/DB.java
	src/org/fdroid/fdroid/FDroid.java
	src/org/fdroid/fdroid/ManageRepo.java
	src/org/fdroid/fdroid/UpdateService.java

2013-12-06 08:43:11 +11:00

..

fdroid/fdroid

Merge branch 'master' into improvement/16/manage-single-repo

2013-12-06 08:43:11 +11:00