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:
This commit is contained in:
Simon L'nu 2012-05-04 02:31:21 -04:00
parent 22c8fe46a5
commit 00190b7faa

Diff Content Not Available