Merge commit 'gpodder-2.15' into maemo-5
commit7f6f13fffafc35ca64778f242b469406ccb1c86c
authorThomas Perl <m@thp.io>
Tue, 3 May 2011 19:55:09 +0000 (3 21:55 +0200)
committerThomas Perl <m@thp.io>
Tue, 3 May 2011 19:55:09 +0000 (3 21:55 +0200)
tree0f50dbb1cbd502e8287f248d3a7cf9fceaab4bc6
parentacca6469663675b9440bce9fd541a962844bf4bf
parent6903dff990a2c2588d1dab72a4a49c3e367daa3b
Merge commit 'gpodder-2.15' into maemo-5