Merge commit 'refs/merge-requests/55' of git://gitorious.org/f-droid/fdroiddata into...
authorCiaran Gultnieks <ciaran@ciarang.com>
Thu, 23 Aug 2012 08:56:56 +0000 (09:56 +0100)
committerCiaran Gultnieks <ciaran@ciarang.com>
Thu, 23 Aug 2012 08:56:56 +0000 (09:56 +0100)
commita2cad315542bd7e1da0ead9ca433457da629b399
tree80d02bc2409f94643c6d5edcc61f55e1b42fb5a8
parent4c1c7fd1f589ef32da4cd5006590cd8dfb9617e2
parentc83d3ef3e39de33abf8f89aaae9ba31b3f659cc3
Merge commit 'refs/merge-requests/55' of git://gitorious.org/f-droid/fdroiddata into merge-requests/55

Conflicts:
metadata/android.game.prboom.txt
metadata/com.android.keepass.txt
metadata/com.axelby.podax.txt
metadata/com.bwx.bequick.txt
metadata/com.fsck.k9.txt
metadata/com.owncloud.android.txt
metadata/com.showmehills.txt
metadata/com.zoffcc.applications.zanavi.txt
metadata/de.schildbach.wallet_test.txt
metadata/jp.sblo.pandora.jota.txt
metadata/me.guillaumin.android.osmtracker.txt
metadata/org.eehouse.android.xw4.txt
metadata/org.mozilla.firefox_beta.txt
metadata/org.thoughtcrime.securesms.txt
metadata/org.wahtod.wififixer.txt
metadata/org.wordpress.android.txt
12 files changed:
metadata/cgeo.geocaching.txt
metadata/com.axelby.podax.txt
metadata/com.github.mobile.txt
metadata/com.showmehills.txt
metadata/com.zoffcc.applications.zanavi.txt
metadata/de.schildbach.wallet_test.txt
metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
metadata/jp.sblo.pandora.jota.txt
metadata/me.guillaumin.android.osmtracker.txt
metadata/net.sourceforge.servestream.txt
metadata/org.mozilla.firefox_beta.txt
metadata/org.wahtod.wififixer.txt