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

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

* remotes/upstream/master:
  bugs #312, #313
  revup

* master:
---