From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 2 Aug 2012 02:59:54 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=31eff376939b2d739e1cb31cb1407cf064b7eaac;p=friendica.git

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

* remotes/upstream/master:
  ugly fix to make editplain work
  quattro: readd sparkle cursor
  quattro: style for "show more" addon
  tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
  logic was reversed - should work now
  fix almost all errant divs in view/ and frost folders
  Provide backend ability to poke as a comment rather than top-level post
  rev update
---

31eff376939b2d739e1cb31cb1407cf064b7eaac