Merge branch 'master' into core-updates

author Mark H Weaver <mhw@netris.org>

Tue, 30 Dec 2014 17:23:32 +0000 (12:23 -0500)

committer Mark H Weaver <mhw@netris.org>

Tue, 30 Dec 2014 17:23:32 +0000 (12:23 -0500)
author Mark H Weaver <mhw@netris.org>
Tue, 30 Dec 2014 17:23:32 +0000 (12:23 -0500)
committer Mark H Weaver <mhw@netris.org>
Tue, 30 Dec 2014 17:23:32 +0000 (12:23 -0500)
diff --cc gnu-system.am
Simple merge
diff --cc gnu/packages/games.scm
Simple merge
diff --cc gnu/packages/glib.scm
Simple merge
diff --cc gnu/packages/gnome.scm
Simple merge
diff --cc gnu/packages/python.scm
Simple merge
diff --cc tests/packages.scm
Simple merge
author	Mark H Weaver <mhw@netris.org>
	Tue, 30 Dec 2014 17:23:32 +0000 (12:23 -0500)
committer	Mark H Weaver <mhw@netris.org>
	Tue, 30 Dec 2014 17:23:32 +0000 (12:23 -0500)
		1	2
gnu-system.am	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/games.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/glib.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/python.scm	patch \|	diff1 \|	diff2 \|	blob \| history
tests/packages.scm	patch \|	diff1 \|	diff2 \|	blob \| history