Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Wed, 29 Aug 2012 10:14:10 +0000 (11:14 +0100)
committerDavid Black <david8black@gmail.com>
Wed, 29 Aug 2012 10:14:10 +0000 (11:14 +0100)
commit3a8c011c84c62c66f1686aec23f947cb7f2b6f28
tree21be64ccbdd89e054c39c9c3e2c77cc09a6ef4a9
parent4a00b207cd8122a1154a9466aa69407778866530
parent7c4a86f05501cee03f65bffd6479deeb8921d8c2
Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata

Conflicts:
metadata/net.osmand.txt
metadata/net.osmand.plus.txt
metadata/org.fdroid.fdroid.txt