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)
1  2 
gnu/packages/freedesktop.scm
gnu/packages/linux.scm

Simple merge
Simple merge