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

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

* remotes/upstream/master:
  search should be ok, but a little extra security won't hurt
  messages-menu translation, add scroll-to-top and theme-bug-report in theme
  Fixed...merged with mainline THEN added beards.
  added beard smileys
  doc/Account-Basics.md
  doc/Account-Basics.md
  a
  doc/Remove-Account.md
  doc/Making-Friends.md
  doc/Bugs-and-Issues.md
  doc/Account-Basics.md

* master:
---

a33ca0a7318cf727b5c605c381e4c6f20463ad3e