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

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

b3680c0d266f06d2474cb45750b0486d246a8315