| commit | ffc07a0a0e15c6ef5620a422fdc7e402b00f7360 | |
| author | Thomas Perl <m@thp.io> | |
| Sat, 8 Mar 2014 21:40:47 +0000 (8 22:40 +0100) | ||
| committer | Thomas Perl <m@thp.io> | |
| Sat, 8 Mar 2014 21:40:47 +0000 (8 22:40 +0100) | ||
| tree | 30ec45db0670222866d64a2e4d3d00c7e975d09f | treesnapshot (tar.gz zip) |
| parent | 3ef6ccb22b37ed3ce7027654b01a1a3a6811a73f | commitdiff |
| parent | e86e560b78055e1311000e27fbe89d5892862d5e | commitdiff |
Merge commit 'gpodder-3.6.1' into harmattan
Conflicts:
share/applications/gpodder.desktop.in
Conflicts:
share/applications/gpodder.desktop.in