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

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

* remotes/upstream/master:
  a few more continues that should be returns
  small bugfix. sometimes also avatar pics were rescaled

* master:
---

ecd1dab373a1fccb1663023f6515ed148475079d