Merge branch 'media-updates'
authorMark H Weaver <mhw@netris.org>
Thu, 25 Feb 2016 18:50:19 +0000 (13:50 -0500)
committerMark H Weaver <mhw@netris.org>
Thu, 25 Feb 2016 18:50:19 +0000 (13:50 -0500)
1  2 
doc/guix.texi
gnu-system.am
gnu/packages/freedesktop.scm

diff --cc doc/guix.texi
Simple merge
diff --cc gnu-system.am
Simple merge
Simple merge