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

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

* remotes/upstream/master:
  bug #329 - compress the plugin list on the friendica info page
  bug #346 - add oembed maxwidth to oembed request

* master:
---

5bd4f62210c9672dd7d502cf8a74ee34727536fc