Merge tag 'gpodder-3.1.0' into harmattan
commit45417ba2c2feed10416f1f1be5565f6e1e0bf81a
authorThomas Perl <m@thp.io>
Tue, 27 Mar 2012 00:24:15 +0000 (27 02:24 +0200)
committerThomas Perl <m@thp.io>
Tue, 27 Mar 2012 00:24:15 +0000 (27 02:24 +0200)
treedff48663deb93bad09b89bde87ce69a69bb18b76
parentf1e1f1e0033ac12cb79b524ba70191890c507c75
parentd3a964022811eeada1caabc1cfc7434a62cabab9
Merge tag 'gpodder-3.1.0' into harmattan

Conflicts:
setup.py
setup.py
share/applications/gpodder.desktop.in
share/icons/hicolor/48x48/gpodder.png