Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Sun, 14 Jun 2015 12:49:42 +0000 (08:49 -0400)
committerMark H Weaver <mhw@netris.org>
Sun, 14 Jun 2015 12:49:42 +0000 (08:49 -0400)
commitbcf2971f6ebc965aa94391b2a8d39e5005885806
treec12187a787b934fb79d159046a4a5516e5d39f97
parentec2990716005b4b41bab6b707ada0206c1655be8
parent7871724df7218428fac53133496c474bac8c5ea8
Merge branch 'master' into core-updates

Conflicts:
gnu/packages/commencement.scm
gnu/packages/xml.scm
gnu-system.am
gnu/packages/commencement.scm
gnu/packages/cross-base.scm
gnu/packages/make-bootstrap.scm
gnu/packages/perl.scm
gnu/packages/xml.scm
guix/packages.scm