Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Tue, 13 Jan 2015 17:14:08 +0000 (12:14 -0500)
committerMark H Weaver <mhw@netris.org>
Tue, 13 Jan 2015 17:14:08 +0000 (12:14 -0500)
commita813710a5fb0822e9d95088462d70f6522fe8457
tree35299db4712eda92c809635716d530d085223e81
parentd8cd15949092b7cd90ee1dcc4aefe87b3ba4a6fb
parent765f0ac8f9f67f775a667a4276faf85ddde6d7ea
Merge branch 'master' into core-updates
doc/guix.texi
gnu-system.am
gnu/packages/gnome.scm
gnu/packages/libcanberra.scm
gnu/packages/linux.scm