Merge branch 'master' into core-updates
authorLudovic Courtès <ludo@gnu.org>
Wed, 20 Nov 2013 22:51:26 +0000 (23:51 +0100)
committerLudovic Courtès <ludo@gnu.org>
Wed, 20 Nov 2013 22:51:26 +0000 (23:51 +0100)
commitedae5b3d50692c25e29fe65fdc14ae3ccdce884d
treeec257af3a922fd96bda8b8b16c00c8d0beaf445a
parent1dba64079c5aaa1fb40e4b1d989f1f06efd6cb63
parente3aaefe71bd26daf6fdbfd0634f68a90985e059b
Merge branch 'master' into core-updates

Conflicts:
guix/packages.scm
gnu-system.am
gnu/packages/base.scm
gnu/packages/gnunet.scm
gnu/packages/linux.scm
gnu/packages/version-control.scm
guix/build-system/python.scm
guix/packages.scm
tests/packages.scm