Peter Serwylo ffa2c962dc Merge branch 'master' into improvement/16/manage-repos
Conflicts:
	res/layout/appdetails.xml
	res/values/strings.xml
	src/org/fdroid/fdroid/DB.java
	src/org/fdroid/fdroid/FDroid.java
	src/org/fdroid/fdroid/ManageRepo.java
2014-01-04 20:19:27 +11:00
..
2013-12-31 11:03:34 +01:00
2013-11-08 16:42:53 +00:00
2013-11-08 16:42:53 +00:00
2013-11-08 16:42:53 +00:00
2013-12-29 12:55:24 +00:00
2013-11-08 22:24:04 +00:00
2013-11-08 16:42:53 +00:00
2013-11-08 16:42:53 +00:00
2013-11-22 20:08:59 +00:00
2013-11-22 20:08:59 +00:00
2013-11-22 20:08:59 +00:00
2013-11-22 20:08:59 +00:00
2013-12-29 12:55:24 +00:00
2013-11-08 16:42:53 +00:00
2013-11-08 16:42:53 +00:00
2013-11-11 09:49:35 +00:00
2013-12-29 12:55:24 +00:00
2013-11-22 20:08:59 +00:00
2013-12-29 12:55:24 +00:00
2013-12-29 12:55:24 +00:00
2013-11-08 16:42:53 +00:00
2013-11-08 16:42:53 +00:00
2013-11-08 16:42:53 +00:00
2013-11-22 20:08:59 +00:00
2013-12-29 12:55:24 +00:00
2013-11-08 22:24:04 +00:00
2013-11-08 22:24:04 +00:00
2013-11-08 16:42:53 +00:00
2014-01-01 01:47:10 +01:00