Merge branch 'master' into core-updates

author Ludovic Courtès <ludo@gnu.org>

Thu, 9 Apr 2015 19:10:46 +0000 (21:10 +0200)

committer Ludovic Courtès <ludo@gnu.org>

Thu, 9 Apr 2015 19:10:46 +0000 (21:10 +0200)
author Ludovic Courtès <ludo@gnu.org>
Thu, 9 Apr 2015 19:10:46 +0000 (21:10 +0200)
committer Ludovic Courtès <ludo@gnu.org>
Thu, 9 Apr 2015 19:10:46 +0000 (21:10 +0200)
diff --cc doc/guix.texi
Simple merge
diff --cc gnu-system.am
Simple merge
diff --cc gnu/packages/gnome.scm
Simple merge
diff --cc gnu/packages/haskell.scm
Simple merge
diff --cc tests/packages.scm
Simple merge
author	Ludovic Courtès <ludo@gnu.org>
	Thu, 9 Apr 2015 19:10:46 +0000 (21:10 +0200)
committer	Ludovic Courtès <ludo@gnu.org>
	Thu, 9 Apr 2015 19:10:46 +0000 (21:10 +0200)
		1	2
doc/guix.texi	patch \|	diff1 \|	diff2 \|	blob \| history
gnu-system.am	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/haskell.scm	patch \|	diff1 \|	diff2 \|	blob \| history
tests/packages.scm	patch \|	diff1 \|	diff2 \|	blob \| history