From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 29 Feb 2012 11:56:59 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=68554741465e92fe2e462b8de4470ddd0eb91302;p=friendica.git

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

* remotes/upstream/master:
  Update LICENSE
  Update README
  cleaned up mess created when both people request friendship and one approves as duplex
  call time pass by reference deprecated
  From Tobias H - catch some irregularities caused by cut/paste code

* master:
---

68554741465e92fe2e462b8de4470ddd0eb91302