Merge branch 'master' of gitorious.org:~dalb8/f-droid/daithib8s-fdroiddata 38
authorDavid Black <david8black@gmail.com>
Thu, 12 Jul 2012 12:50:43 +0000 (13:50 +0100)
committerDavid Black <david8black@gmail.com>
Thu, 12 Jul 2012 12:50:43 +0000 (13:50 +0100)
commit1433296608fd4130d61b6e9ee87b05a98def2d4c
treecaa90de8afa6fec0e4b8fa8abd76288dc9de1887
parent9f778a921cce6ad0ec6653d20ef3d1d66d9353e6
parent87d7cbe56e87a64aa0f6d5313bf44ed893761d0d
Merge branch 'master' of gitorious.org:~dalb8/f-droid/daithib8s-fdroiddata

Conflicts:
metadata/triqita.obsqr.txt