From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 2 Apr 2012 20:53:47 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9cb3fc226a9246b36810338f0ee8a115738cc97b;p=friendica.git

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

* remotes/upstream/master:
  diabook-themes: css-fixes
  diabook-themes: fixes in js
  diabook-themes: fixed pageheader
  diabook-themes: bugfixes / css-fixes
  make the "new calendar" (javascript interactive) the default
  remove zrl from query string
  catch a couple more Oo smilies
  add page_content_top hook

* master:
---

9cb3fc226a9246b36810338f0ee8a115738cc97b