Merge branch 'wip-gobject-introspection'

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

diff --cc gnu/packages/gnome.scm
index 0a6c1d4,0f33880..535913b
--- 1/gnu/packages/gnome.scm
--- 2/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -1,8 -1,9 +1,9 @@@
  ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 -;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
 +;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 +;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
  ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+ ;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/gtk.scm
index b03cf76,f48815a..6bd4e36
--- 1/gnu/packages/gtk.scm
--- 2/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -1,8 -1,9 +1,9 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 -;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
  ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+ ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

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

diff --cc gnu/packages/python.scm
index 5555acf,2f518d9..4b30695
--- 1/gnu/packages/python.scm
--- 2/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -1,10 -1,10 +1,10 @@@
  ;;; GNU Guix --- Functional package management for GNU
  ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
  ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 -;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
 +;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
  ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
  ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
- ;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
+ ;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;