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

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

* remotes/upstream/master:
  bug #307, explaining decentralised private photos is impossible.
  this turns out to be harder than I thought
  cleanup - make bb-buttons vanish when comment closed
  Esperanto at 100% again

* master:
---

78280bdfed363f2316f1fa4e854e9604ebd58470