Merge branch 'core-updates'
authorLudovic Courtès <ludo@gnu.org>
Tue, 9 Jul 2013 20:17:18 +0000 (22:17 +0200)
committerLudovic Courtès <ludo@gnu.org>
Tue, 9 Jul 2013 20:17:18 +0000 (22:17 +0200)
1  2 
Makefile.am
gnu-system.am
gnu/packages/gcc.scm

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