Merge branch 'master' into core-updates
authorLudovic Courtès <ludo@gnu.org>
Fri, 8 Nov 2013 20:58:09 +0000 (21:58 +0100)
committerLudovic Courtès <ludo@gnu.org>
Fri, 8 Nov 2013 20:58:09 +0000 (21:58 +0100)
commit7db9608d52ab431165ab150a0a0707c686990c1c
treeb19d49a71e71f8da939a4825b545da3a31907e65
parent7a78cc7af24a1303dd0117cb977e15ca89a5dad8
parent6a9957545ce51e7a50381059d4509d0dfcba0aba
Merge branch 'master' into core-updates

Conflicts:
guix/packages.scm
gnu-system.am
guix/packages.scm
tests/packages.scm