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

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

* remotes/upstream/master:
  DE: update for the strings
  quattro: added editor buttons to comments
  quattro: cleanup the less file

* master:
---