Ciaran Gultnieks 8401d53dc0 Merge commit 'refs/merge-requests/24' of git://gitorious.org/f-droid/fdroidclient into merge-requests/24 ...

Conflicts:
	src/org/fdroid/fdroid/DB.java

2013-04-16 09:39:10 +01:00

..

fdroid

Merge commit 'refs/merge-requests/24' of git://gitorious.org/f-droid/fdroidclient into merge-requests/24

2013-04-16 09:39:10 +01:00