From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 2 May 2012 16:49:00 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=02dc116a9c646ea5683b8df199a7ff492ae6cfcb;p=friendica.git

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:
---

02dc116a9c646ea5683b8df199a7ff492ae6cfcb