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

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

* remotes/upstream/master:
  fixes in diabook
  unused replacement variable displays %1 in all html2bbcode 'code' blocks
  revup
  style.css fix

* master:
---

b34dd1ca713128d958712366140c80e35019a489