Merge branch 'master' of gitorious.org:f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Wed, 11 Jul 2012 12:59:25 +0000 (13:59 +0100)
committerDavid Black <david8black@gmail.com>
Wed, 11 Jul 2012 12:59:25 +0000 (13:59 +0100)
commit8efc3ca14ddb3fedfee14c084c4836a4bea8bab1
treefb43deae836edfa84ee4d15cd75cfc4e3761f0f5
parent87454c250c80aba03b1f59261b373fc9025907f1
parentdedf48dd3ea58e279efd5598b3d212e38b6512f7
Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/triqita.obsqr.txt
metadata/com.ubuntuone.android.files.txt
metadata/triqita.obsqr.txt