Merge commit 'refs/merge-requests/54' of git://gitorious.org/f-droid/fdroiddata into...
authorCiaran Gultnieks <ciaran@ciarang.com>
Wed, 29 Aug 2012 11:37:17 +0000 (12:37 +0100)
committerCiaran Gultnieks <ciaran@ciarang.com>
Wed, 29 Aug 2012 11:37:17 +0000 (12:37 +0100)
commita6fe490f4e12cf5ac615a07d0eb694ed5324e796
treecd789958afc17424799edc6b4b482160b22be1e3
parentac7fe888558c0826766ef7998867fa65b87636c4
parent519239ed093a24bfc6f0d6822fbf07f93d02f6a2
Merge commit 'refs/merge-requests/54' of git://gitorious.org/f-droid/fdroiddata into merge-requests/54

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