Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Sun, 14 May 2017 15:21:46 +0000 (17:21 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Sun, 14 May 2017 15:21:46 +0000 (17:21 +0200)
1  2 
gnu/packages/gnome.scm
gnu/packages/linux.scm
gnu/packages/xorg.scm

Simple merge
Simple merge
Simple merge