Merge branch 'master' into gnome-updates
authorMark H Weaver <mhw@netris.org>
Wed, 11 May 2016 17:37:47 +0000 (13:37 -0400)
committerMark H Weaver <mhw@netris.org>
Wed, 11 May 2016 17:37:47 +0000 (13:37 -0400)
commit9f5e79675367aedd6be89e07edbc08a6e3695fab
tree2679dfc572b7173ba6fe52611047a47283af119d
parente2b89203db6c2056c9658be40ab1be471769d9eb
parentcf60e76a9503156a8c1047fa446525b28842f7e8
Merge branch 'master' into gnome-updates
gnu/local.mk
gnu/packages/gnome.scm
gnu/packages/xdisorg.scm