From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 28 Mar 2012 10:48:05 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=57ef21295ab725361950b53aaa9f502d99bbfa47;p=friendica.git

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

* remotes/upstream/master:
  viewsrc: return only body if page is requested via ajax

* master:
---

57ef21295ab725361950b53aaa9f502d99bbfa47