Merge branch 'master' of gitorious.org:~dalb8/f-droid/daithib8s-fdroiddata
authorDavid Black <david8black@gmail.com>
Mon, 27 Aug 2012 13:09:46 +0000 (14:09 +0100)
committerDavid Black <david8black@gmail.com>
Mon, 27 Aug 2012 13:09:46 +0000 (14:09 +0100)
commitec40c8133ac94d027e547fb7c36231ae4ef64ca4
tree6648a5855d70c47a62f9f936091b1756c63d421b
parentd26cb88d9ee1a17c973168ecc4650ae6ee025a75
parent519239ed093a24bfc6f0d6822fbf07f93d02f6a2
Merge branch 'master' of gitorious.org:~dalb8/f-droid/daithib8s-fdroiddata

Conflicts:
metadata/org.fdroid.fdroid.txt