From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 3 Mar 2012 14:45:32 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2b9ea33e8b2f774d7c4da5175e167470f1070282;p=friendica.git

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

* remotes/upstream/master:
  fix editor

* master:
---

2b9ea33e8b2f774d7c4da5175e167470f1070282