Merge commit 'refs/merge-requests/65' of git://gitorious.org/f-droid/fdroiddata into...
authorDavid Black <david8black@gmail.com>
Thu, 6 Sep 2012 17:47:59 +0000 (18:47 +0100)
committerDavid Black <david8black@gmail.com>
Thu, 6 Sep 2012 17:47:59 +0000 (18:47 +0100)
commitdfb0437e98d44d963159d805befa06e9fda139d8
tree3ec1628a224493e6c27ae480d891389a1527359c
parent41d43c6cc9d2fb69a752be002be56a7548f34b57
parentff7e0e621a49c3325cbcf0fb83784f2d679730c2
Merge commit 'refs/merge-requests/65' of git://gitorious.org/f-droid/fdroiddata into merge-requests/65

Conflicts:
metadata/de.danoeh.antennapod.txt
metadata/de.danoeh.antennapod.txt