Merge branch 'core-updates'
authorLudovic Courtès <ludo@gnu.org>
Fri, 20 Jun 2014 21:44:42 +0000 (23:44 +0200)
committerLudovic Courtès <ludo@gnu.org>
Fri, 20 Jun 2014 21:44:42 +0000 (23:44 +0200)
1  2 
gnu-system.am
guix/scripts/substitute-binary.scm

diff --cc gnu-system.am
Simple merge
Simple merge