01/03: Merge branch 'master' into dbus-update

[Mark H. Weaver]

mhw pushed a commit to branch dbus-update
in repository guix.

commit 7c6fb733e91675d1a0b80e863a422a55d1f3aa5d
Merge: e38a71e b1599b5
Author: Mark H Weaver <address@hidden>
Date:   Tue Oct 20 14:11:43 2015 -0400

    Merge branch 'master' into dbus-update

 Makefile.am                  |    2 +
 configure.ac                 |    1 +
 doc.am                       |    1 +
 doc/contributing.texi        |   11 ++
 doc/guix.texi                |  154 ++++++++++++++++++++++++++-
 emacs/guix-backend.el        |    3 +-
 emacs/guix-config.el.in      |   16 ++--
 emacs/guix-devel.el          |   21 ++++-
 emacs/guix-external.el       |   18 +++-
 emacs/guix-profiles.el       |    2 +-
 gnu/packages/freedesktop.scm |    3 +
 gnu/packages/gnunet.scm      |    8 +-
 gnu/packages/maths.scm       |    4 +-
 guix/scripts/archive.scm     |   10 ++
 guix/scripts/challenge.scm   |  244 ++++++++++++++++++++++++++++++++++++++++++
 guix/scripts/substitute.scm  |   40 ++++++-
 po/guix/POTFILES.in          |    1 +
 tests/challenge.scm          |  114 ++++++++++++++++++++
 tests/guix-archive.sh        |   15 +++-
 19 files changed, 642 insertions(+), 26 deletions(-)