Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Wed, 29 Aug 2012 12:59:21 +0000 (13:59 +0100)
committerDavid Black <david8black@gmail.com>
Wed, 29 Aug 2012 12:59:21 +0000 (13:59 +0100)
commit3f701119640ed3b9af82ca2b9a71c99ed9591eb5
treedcfd2135398c13cfd7385138d37a0ce81cabe244
parent0d520ee655280bbab5cadd0001be9842fd2f9f9e
parent9268f7816fdf13d04799344c63bc697d5620905d
Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata

Conflicts:
metadata/net.osmand.txt