Merge commit 'refs/merge-requests/2' of git://gitorious.org/f-droid/fdroiddata into...
authorDavid Black <david8black@gmail.com>
Sun, 4 Nov 2012 17:28:11 +0000 (17:28 +0000)
committerDavid Black <david8black@gmail.com>
Sun, 4 Nov 2012 17:28:11 +0000 (17:28 +0000)
commit333e1e4099b797f48d8e7b33e7ccb28dafa8487a
tree2022639bcb16f571acead020c968d9a313818d65
parenta67a996095ddb9679b697cd1fe55c6b7fcf6ebc7
parentb3d37ca4e8dca08d041c6c8a346a79ae1c55187e
Merge commit 'refs/merge-requests/2' of git://gitorious.org/f-droid/fdroiddata into merge-requests/2

Conflicts:
metadata/org.bc_bd.mrwhite.txt