Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
	metadata/net.osmand.plus.txt
This commit is contained in:
David Black 2013-01-20 14:42:44 +00:00
commit 91079f4f77

Diff content is not available