Marius Bakke 8505eb19a4
Merge branch 'staging' into core-updates
Conflicts:
	gnu/local.mk: Missing mention of gdk-pixbuf-list-dir.patch in the
	commit log really confused me here... It's from 8c6b077bfae (staging).
	gnu/packages/xorg.scm: xkeyboard-config updated both places.
2017-02-21 14:31:36 +01:00
..