Merge commit 'gpodder-3.8.0' into harmattan
commit8aa63d4e1a09de085e26af2e743f3823779c9785
authorThomas Perl <m@thp.io>
Sat, 26 Jul 2014 16:56:46 +0000 (26 18:56 +0200)
committerThomas Perl <m@thp.io>
Sat, 26 Jul 2014 16:56:46 +0000 (26 18:56 +0200)
treebecd74e7c70da172b9db3e87bd8723512943c556
parent31f07f8966f9320e922d4b5733f5322b15e788e1
parent47e96b6ec410e9bd421ae9ca812542819254a0f6
Merge commit 'gpodder-3.8.0' into harmattan

Conflicts:
bin/gpodder
bin/gpodder