Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Thu, 23 Aug 2012 10:17:50 +0000 (11:17 +0100)
committerDavid Black <david8black@gmail.com>
Thu, 23 Aug 2012 10:17:50 +0000 (11:17 +0100)
commitce937c186fed87b8a685383031400f101119ac01
tree405cd788c4c9da661bcbc401fafa6ad985640041
parentc83d3ef3e39de33abf8f89aaae9ba31b3f659cc3
parentf2e5ab06472590001c0dd4f46086a455ec64d95e
Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata

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.wahtod.wififixer.txt
metadata/org.wordpress.android.txt
20 files changed:
metadata/android.game.prboom.txt
metadata/cgeo.geocaching.txt
metadata/com.android.keepass.txt
metadata/com.axelby.podax.txt
metadata/com.bwx.bequick.txt
metadata/com.fsck.k9.txt
metadata/com.github.mobile.txt
metadata/com.owncloud.android.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.eehouse.android.xw4.txt
metadata/org.mozilla.firefox_beta.txt
metadata/org.wahtod.wififixer.txt
metadata/org.wordpress.android.txt
metadata/se.johanhil.clipboard.txt