From c96b40ab5fff900cf6cbec6f16f1b3e88116fe96 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 1 May 2012 21:38:33 -0400
Subject: [PATCH] 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: