Merge commit 'refs/merge-requests/38' of git://gitorious.org/f-droid/fdroiddata into...
authorCiaran Gultnieks <ciaran@ciarang.com>
Sat, 21 Jul 2012 19:23:12 +0000 (20:23 +0100)
committerCiaran Gultnieks <ciaran@ciarang.com>
Sat, 21 Jul 2012 19:23:12 +0000 (20:23 +0100)
commit97d3339a62539ab55f9ca43b3d25812317cb8407
treeb2a92f1043270ba6556bb659aad3bfd407ee937a
parent438e06ac85a8695a427e8a54a9244aaa65c4a008
parent1433296608fd4130d61b6e9ee87b05a98def2d4c
Merge commit 'refs/merge-requests/38' of git://gitorious.org/f-droid/fdroiddata into merge-requests/38

Conflicts:
metadata/com.google.code.geobeagle.txt
metadata/com.intervigil.micdroid.txt
metadata/com.uploadedlobster.PwdHash.txt
metadata/name.boyle.chris.sgtpuzzles.txt
metadata/net.exclaimindustries.geohashandroid.txt
metadata/org.opengpx.txt
metadata/org.pyload.android.client.txt
metadata/com.uploadedlobster.PwdHash.txt