Merge branch 'master' into gnome-updates
authorMark H Weaver <mhw@netris.org>
Sat, 14 Jan 2017 10:24:09 +0000 (05:24 -0500)
committerMark H Weaver <mhw@netris.org>
Sat, 14 Jan 2017 10:24:09 +0000 (05:24 -0500)
1  2 
gnu/packages/freedesktop.scm

Simple merge