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

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

* remotes/upstream/master:
  line 86: s/Friendika/Friendica/
  fix "between yourself and You" in mail list

* master:
---

bbd86382a61ac814a84d50a871cd32989b1d73c3