Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Wed, 20 Aug 2014 07:17:56 +0000 (03:17 -0400)
committerMark H Weaver <mhw@netris.org>
Wed, 20 Aug 2014 07:17:56 +0000 (03:17 -0400)
1  2 
gnu-system.am
gnu/packages/guile.scm

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