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

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

* remotes/upstream/master:
  DE strings
  implement max load average before queuing/deferring delivery and poller processes
  yet another bug in remote_friends_in_common
  string update
  use html symbols for double quotes
  string update
  proofreading the mail templates in fr fixed typo, grammar, spelling…
  validate_url() and validate_email() validate also IP address.

* master:
---