From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 4 May 2012 21:03:23 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5830c32dceb2429656ee4957690dd78c24641f02;p=friendica.git

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

* remotes/upstream/master:
  category removal
  Esperanto 100%
  "show more" friends in common

* master:
---

5830c32dceb2429656ee4957690dd78c24641f02