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

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

* remotes/upstream/master:
  expand multiple heart smilies e.g. <3333

* master:
---

bcadd873eea086255152708c4d1cede4d3dcc581