Merge branch 'master' into core-updates

diff --cc gnu-system.am
index d37775d,3426056..297f40a
--- 1/gnu-system.am
--- 2/gnu-system.am
+++ b/gnu-system.am
@@@ -1,6 -1,6 +1,6 @@@
  # GNU Guix --- Functional package management for GNU
 -# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 +# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
- # Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
+ # Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
  # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
  #
  # This file is part of GNU Guix.

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/mail.scm
Simple merge

diff --cc gnu/packages/tls.scm
Simple merge

diff --cc gnu/packages/video.scm
Simple merge