Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Thu, 12 Jul 2012 09:11:09 +0000 (10:11 +0100)
committerDavid Black <david8black@gmail.com>
Thu, 12 Jul 2012 09:11:09 +0000 (10:11 +0100)
commit57714a2dfa3dec5be9f1733fecf859b2bae04e14
tree0745faa95956f688c467b4e73ed6da4462f01506
parentd9c7a6d643d8208be6902da38387374f51fc3864
parentdedf48dd3ea58e279efd5598b3d212e38b6512f7
Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata

Conflicts:
metadata/triqita.obsqr.txt
metadata/triqita.obsqr.txt