From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 2 Apr 2012 03:56:13 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c;p=friendica.git

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

* remotes/upstream/master:
  add title to D* posts
  allow users to set categories on their posts
  Modified peopleyouknow to handle sites without Facebook better
  diabook-themes: add link to global dir in "find friends" at right_aside
  modified:   mod/newmember.php
  New user quick start.
  check for style.php existence before inclusion
  Moved Diaspora notes away from top, per user request

* master:
---

5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c