Merge branch 'master' of gitorious.org:f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Mon, 13 Aug 2012 19:40:36 +0000 (20:40 +0100)
committerDavid Black <david8black@gmail.com>
Mon, 13 Aug 2012 19:40:36 +0000 (20:40 +0100)
commitdc24a90f139dc12e4f1f69bbd8bcc807b2959388
tree818c43b300114467b34f9ff37350b07dfa70242a
parentab93c6f01ad72a9f4f9b5b7f63c3b6981306dc2c
parenta1d3e4f7d74a7b01d01eacc7e20dd83f34b978f2
Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
metadata/com.dririan.RingyDingyDingy.txt
metadata/net.nightwhistler.pageturner.txt
metadata/net.nightwhistler.pageturner.txt