06/06: Merge branch 'master' into staging

[Leo Famulari]

lfam pushed a commit to branch staging
in repository guix.

commit 351ab2c13fb754248bf6f8a5c65bb7e58360b609
Merge: 603308e ae6591e
Author: Leo Famulari <address@hidden>
Date:   Tue Jan 17 03:56:08 2017 -0500

    Merge branch 'master' into staging

 gnu/packages/bioinformatics.scm |   24 ++++
 gnu/packages/crypto.scm         |   38 ++++++-
 gnu/packages/emacs.scm          |   43 +++++++-
 gnu/packages/guile.scm          |    6 +-
 gnu/packages/haskell.scm        |    8 +-
 gnu/packages/imagemagick.scm    |    4 +-
 gnu/packages/kde.scm            |   21 ++--
 gnu/packages/ocaml.scm          |  233 ++++++++++++++++++++++++++++++++++++++-
 gnu/packages/photo.scm          |   12 +-
 gnu/packages/python.scm         |   28 +++++
 gnu/system/file-systems.scm     |   38 ++++++-
 gnu/tests/install.scm           |    5 +-
 guix/grafts.scm                 |    8 +-
 tests/file-systems.scm          |   24 +++-
 14 files changed, 452 insertions(+), 40 deletions(-)