Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: improve handling of relative feed url's convert html entities to utf-8 before email header encoding More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway. modified: images/smiley-thumbsup.gif diabook-themes: small fix at "community pages"-box link socgraph to zrls adding zrl support to social graphs * master:
This commit is contained in:
parent
f24ffa8ef0
commit
c96b40ab5f