Ciaran Gultnieks 87bb85bdf1 Merge branch 'master' of gitorious.org:f-droid/fdroidclient
Conflicts:
	res/values-el/strings.xml
	res/values-eu/strings.xml
	res/values-sr/strings.xml
	res/values-tr/strings.xml
	res/values-ug/strings.xml
	res/values-uk/strings.xml
2013-11-08 17:03:13 +00:00
..
2013-11-08 16:42:53 +00:00
2011-11-09 17:58:45 +00:00