From 00190b7faab2baf21523a7243268057142f6de88 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 4 May 2012 02:31:21 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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: