Merge branch 'master' into core-updates
commitb81378251c629615aff0d62ca686bb53a10367de
authorMark H Weaver <mhw@netris.org>
Thu, 8 Oct 2015 14:59:39 +0000 (8 10:59 -0400)
committerMark H Weaver <mhw@netris.org>
Thu, 8 Oct 2015 14:59:39 +0000 (8 10:59 -0400)
tree4c15f2be58d665cf0eed1e00c84f70764890c3b8
parent319fe79dd01e03c4ef61311c336bcd77e1133f02
parentb5881775ac2db345bf5826d6351366346ff03275
Merge branch 'master' into core-updates
gnu-system.am
gnu/packages/python.scm