]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 09:53:54 +0000 (04:53 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 09:53:54 +0000 (04:53 -0500)
commitbcadd873eea086255152708c4d1cede4d3dcc581
tree21aec43a9d5e5ee0b0cdd11e7d797dba47f40c35
parentf0fdd1a163b6bc7213eeb48c6ee9025087bb0032
parentf1bf6dcdfb89bf3c21e498ba3d76c600dafed934
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: