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:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  final touches - show friends in common with total strangers from different sites
  fix size
  cross fingers
  reduce the scope a bit
  add template
  fn not found
  really fat fingers today - though none of this has gone further than my own site
  another one
  typo
  first try common friends for visitors

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
  diabook-theme: tryied to improve performance a bit
  diabook-theme: fix footer/impressum
  missing param
  provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
  delineate the new profile changes from the rest of the text
  how did that happen?
  shuffle results of remote_common_friends widget
  only validate once
  perform basic validation

* master:
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-theme: small fix
  diabook-theme: made boxes at right_aside sortable
  use cid rather than uid in perms
  Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
  use mysql replace on cache items
  fixing common friends
  rev update
  Moved Meta Viewport from global head.tpl to diabook's header

* master:
validate_url() and validate_email() validate also IP address.
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-theme: small fix
  Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.

* master:
major reworking of dispy dark. light to follow

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #285 from simonlnu/master

dispy reworking, step 1
proofreading the mail templates in fr
fixed typo, grammar, spelling…
Merge pull request #286 from grossard/french_proofreading

proofreading the mail templates in fr
Merge pull request #284 from fabrixxm/master

validate_url() and validate_email() validate also IP address.
string update
use html symbols for double quotes
string update
yet another bug in remote_friends_in_common
implement max load average before queuing/deferring delivery and poller processes
DE strings
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE strings
  implement max load average before queuing/deferring delivery and poller processes
  yet another bug in remote_friends_in_common
  string update
  use html symbols for double quotes
  string update
  proofreading the mail templates in fr fixed typo, grammar, spelling…
  validate_url() and validate_email() validate also IP address.

* master:
"show more" friends in common