From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 30 Mar 2012 00:16:49 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fe1e384a51e753baf2d80aaf35af7d0a3b4dfbeb;p=friendica.git

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

* remotes/upstream/master:
  typo in function name

* master:
---

fe1e384a51e753baf2d80aaf35af7d0a3b4dfbeb