Merge branch 'staging'
authorMarius Bakke <mbakke@fastmail.com>
Sun, 4 Jun 2017 22:36:11 +0000 (00:36 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Sun, 4 Jun 2017 22:36:11 +0000 (00:36 +0200)
commitf484a50d50c3778df76d63533634a71cd7301558
tree62fc8360825aad88e34b38d1129e325205fc9632
parent0efea2128846d4df85d712d927cd76792eaae9e3
parentde6f6efd737e941aa7d6f77032525ea757b2909d
Merge branch 'staging'
gnu/local.mk
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/video.scm