Merge branch 'master' of gitorious.org:f-droid/fdroiddata
authorCiaran Gultnieks <ciaran@ciarang.com>
Thu, 13 Jun 2013 10:09:08 +0000 (11:09 +0100)
committerCiaran Gultnieks <ciaran@ciarang.com>
Thu, 13 Jun 2013 10:09:08 +0000 (11:09 +0100)
commit0bc95414632bd7b4cc39aceb39b48817a592ef1b
tree37f15b2eea0d80e84fd2c0327305e1b568f10d19
parent2f77bb0fb366e941d91f62c0adc7d12e02b9be30
parent84a57519ddb8f4b5ed6e524d17e491b3cbe89385
Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/at.univie.sensorium.o3gm.txt
metadata/apps.droidnotify.txt
metadata/at.univie.sensorium.o3gm.txt