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

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

* remotes/upstream/master:
  theme file_as combobox for 2.0
  css fixes in diabook-derivates
  quattro: style pm pages
  message: remove tabs, move new message link to aside, all message with gmail-style
  quattro: tpl for "file as"

* master:
---

e7b920c273efd8c6a70b90f701bd14f5c632d38f