01/01: Merge branch 'master' into python-updates

[Ricardo Wurmus]

rekado pushed a commit to branch python-updates
in repository guix.

commit bcddf30afc6ba2e0dab3d0fb898b7b166f20d4ad
Merge: 4145db3 0fa4702
Author: Ricardo Wurmus <address@hidden>
Date:   Sat Mar 10 15:24:32 2018 +0100

    Merge branch 'master' into python-updates

 gnu/packages/autotools.scm          |  16 ++--
 gnu/packages/django.scm             |  62 ++++++++++++++-
 gnu/packages/gnunet.scm             |   4 +-
 gnu/packages/gnupg.scm              |   4 +-
 gnu/packages/guile.scm              |   4 +-
 gnu/packages/libevent.scm           |   4 +-
 gnu/packages/linux.scm              |  12 +--
 gnu/packages/logging.scm            |   4 +-
 gnu/packages/mail.scm               |   2 +-
 gnu/packages/mate.scm               |   4 +-
 gnu/packages/package-management.scm |   2 +-
 gnu/packages/sawfish.scm            |   2 +-
 gnu/packages/statistics.scm         |  24 +++---
 gnu/packages/video.scm              |   2 +-
 gnu/packages/xorg.scm               |  72 +++++++++---------
 gnu/packages/zile.scm               |   4 +-
 gnu/services/mail.scm               | 147 ++++++++++++++++++------------------
 gnu/system/linux-initrd.scm         |  38 ++++++----
 gnu/tests/mail.scm                  | 120 ++++++++++++++++++++++++++++-
 19 files changed, 355 insertions(+), 172 deletions(-)