Merge branch 'master' into core-updates

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

Wed, 18 Mar 2015 17:11:02 +0000 (18:11 +0100)

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

Wed, 18 Mar 2015 17:11:02 +0000 (18:11 +0100)
author Ludovic Courtès <ludo@gnu.org>
Wed, 18 Mar 2015 17:11:02 +0000 (18:11 +0100)
committer Ludovic Courtès <ludo@gnu.org>
Wed, 18 Mar 2015 17:11:02 +0000 (18:11 +0100)
diff --cc gnu/packages/base.scm
Simple merge
diff --cc gnu/packages/bash.scm
Simple merge
diff --cc gnu/packages/databases.scm
Simple merge
author	Ludovic Courtès <ludo@gnu.org>
	Wed, 18 Mar 2015 17:11:02 +0000 (18:11 +0100)
committer	Ludovic Courtès <ludo@gnu.org>
	Wed, 18 Mar 2015 17:11:02 +0000 (18:11 +0100)
		1	2
gnu/packages/base.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/bash.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	patch \|	diff1 \|	diff2 \|	blob \| history