From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 8 Mar 2012 15:46:40 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bc3051e113245f518e40bb1196521c9fc4ab7bbc;p=friendica.git

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

* remotes/upstream/master:
  add links to /profiles, add some icons to diabook/icons, fixes in css
  Update README
  reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())

* master:
---

bc3051e113245f518e40bb1196521c9fc4ab7bbc