Merge branch 'master' into core-updates
authorMarius Bakke <mbakke@fastmail.com>
Sun, 11 Jun 2017 00:07:06 +0000 (02:07 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Sun, 11 Jun 2017 00:07:06 +0000 (02:07 +0200)
commit5bace4c8ad981b66b5c0769b885d0bb0db91a029
tree0f2fb95c23d7990d26aeed71590bb94a3f2e17fe
parent653569e878f39345b05110b998f10db3b520ccfe
parent20d87dfb453cf27f95c5ef3858e8d096278e1702
Merge branch 'master' into core-updates

Conflicts:
* gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e217f2).
gnu/local.mk
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/wine.scm
gnu/packages/xdisorg.scm
gnu/system.scm