Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata
authorDavid Black <david8black@gmail.com>
Thu, 30 Aug 2012 13:37:43 +0000 (14:37 +0100)
committerDavid Black <david8black@gmail.com>
Thu, 30 Aug 2012 13:37:43 +0000 (14:37 +0100)
commit53a79240e5494fc51d54bbc9b7943acef33e66a3
tree813c4d8f2934e922b5912838869eb1c00861a38e
parent55fd279ed0b26e47300daa27486fecffc0e1eaf0
parent9bb85fccb9b6c6d6f17346dad573201a1f566f4a
Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata

Conflicts:
metadata/apps.droidnotify.txt
metadata/apps.droidnotify.txt
metadata/net.osmand.plus.txt