Merge branch 'master' into gnome-updates
authorMark H Weaver <mhw@netris.org>
Wed, 4 May 2016 15:43:50 +0000 (11:43 -0400)
committerMark H Weaver <mhw@netris.org>
Wed, 4 May 2016 15:43:50 +0000 (11:43 -0400)
commit4e9d04a80b2d8b1e07f78708dae76b13f3d421f6
tree18a163720f4c9fdd7a45d724c6584b065e216c6d
parentad1b7d8bafe96241fd87a74baec0a38ed4389e4b
parent11057c4b58d766f358bc439690b9765bee735772
Merge branch 'master' into gnome-updates
gnu/local.mk
gnu/packages/music.scm