From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 6 Mar 2012 19:51:14 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d647dbc6af33689d0baf4bafd72031d06dcf7577;p=friendica.git

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

* remotes/upstream/master:
  remove "smilie" expansion for Diaspora logo
  prevent duplicate likes
  quattro: theme settings (a bit hackish)
  add img
  fixes in diabook
  finalise spam storage model, begin driver changes.
  fixes
  template proc: add variable filters

* master:
---

d647dbc6af33689d0baf4bafd72031d06dcf7577