Merge commit 'gpodder-2.12' into maemo-5
commit847de05f282e3b04bbc762138aca47cfc0d19450
authorThomas Perl <m@thp.io>
Wed, 12 Jan 2011 11:55:40 +0000 (12 12:55 +0100)
committerThomas Perl <m@thp.io>
Wed, 12 Jan 2011 11:55:40 +0000 (12 12:55 +0100)
tree20da5feac5c80356063cc682e6926d9d20469ede
parent9b3a31223d35c9f933ffba25c74bb7067ed1da80
parent750d5841669a1b16e6340429c1fffcdfbc794c2a
Merge commit 'gpodder-2.12' into maemo-5