Merge commit 'refs/merge-requests/268' of https://gitorious.org/f-droid/fdroiddata...
authorCiaran Gultnieks <ciaran@ciarang.com>
Sun, 15 Dec 2013 08:30:45 +0000 (08:30 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Sun, 15 Dec 2013 08:30:45 +0000 (08:30 +0000)
commitd2753e2f3c486ff57e87d6f4c91849f17cfaa7a5
tree10e456f8adc7869fc0eb47f0ed25f8ba3cececf8
parenta11c7a10c9c287e9d3b426f55cda3d8970d8ccb0
parent8e9d0517cc45a2e2f187007b63b42c472909692c
Merge commit 'refs/merge-requests/268' of https://gitorious.org/f-droid/fdroiddata into merge-requests/268

Conflicts:
metadata/com.matoski.adbm.txt
metadata/uk.co.danieljarvis.android.flashback.txt
metadata/com.matoski.adbm.txt
metadata/com.mirasmithy.epochlauncher.txt
metadata/de.onyxbits.drudgery.txt