Merge branch 'staging'
authorMarius Bakke <mbakke@fastmail.com>
Mon, 30 Apr 2018 17:26:03 +0000 (19:26 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Mon, 30 Apr 2018 17:26:03 +0000 (19:26 +0200)
commita66853810e75055091e9ab5c2fc341fa1811cda4
tree2e5067741284ce5441e91b86de8f8113aa828343
parentfb8966abc43415ca6d1f141c44ebf0c563cea4d2
parenta9fe3882b9400d6a49ca95e136e78477b3e81a07
Merge branch 'staging'
gnu/packages/freedesktop.scm
gnu/packages/linux.scm