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

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

* remotes/upstream/master:
  diabook-themes: some css/bug-fixes
  messages.po/strings.php at 100% Esperanto
  Typo

* master:
---

f087fd5581eb13a792c7f53e87cf251f153677cf