From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 24 Mar 2012 23:38:54 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8a6c407282fe10f676f08f21e28647a5c8794e11;p=friendica.git

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

* remotes/upstream/master:
  prevent duplicate friend suggestions
  block filed items from deletion
  add the bang
  network filter is now a permission group
  small fix in css
  add right_aside to diabook-blue
  add connectable services to right_aside
  add PostIt to right_aside, fixes in css

* master:
---

8a6c407282fe10f676f08f21e28647a5c8794e11