Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Thu, 28 Aug 2014 18:22:15 +0000 (14:22 -0400)
committerMark H Weaver <mhw@netris.org>
Thu, 28 Aug 2014 18:22:15 +0000 (14:22 -0400)
commitc00a9fbfef75d2fc08485f8158ec331bfa99d5ec
tree4737817ee787c4ec8222ea13d3cfecb2ac98b673
parent83291101c39c1cd1bf472280c24ad68d94248c2e
parentdd16424466196616b99c13526537a89aaee27f88
Merge branch 'master' into core-updates

Conflicts:
gnu/packages/base.scm
gnu-system.am
gnu/packages/base.scm
gnu/packages/commencement.scm
gnu/packages/guile.scm