Merge branch 'master' into core-updates

diff --cc gnu-system.am
Simple merge

diff --cc gnu/packages/databases.scm
index 4bb3b4d,9945273..b36f5d8
--- 1/gnu/packages/databases.scm
--- 2/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -3,11 -3,9 +3,11 @@@
  ;;; Copyright © 2012, 2014, 2015 Andreas Enge <andreas@enge.fr>
  ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
  ;;; Copyright © 2014 David Thompson <davet@gnu.org>
- ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
+ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
  ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
  ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 +;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

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

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

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

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

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

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

diff --cc gnu/packages/video.scm
index b3ee980,9e41835..12f10b9
--- 1/gnu/packages/video.scm
--- 2/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -1,9 -1,9 +1,9 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
  ;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
 -;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 +;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
  ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
- ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
  ;;; Copyright © 2015 Andy Patterson <ajpatter@uwaterloo.ca>
  ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
  ;;; Copyright © 2015 Alex Vong <alexvong1995@gmail.com>