Merge branch 'master' into core-updates
authorLeo Famulari <leo@famulari.name>
Thu, 28 Jul 2016 20:46:16 +0000 (16:46 -0400)
committerLeo Famulari <leo@famulari.name>
Thu, 28 Jul 2016 20:46:27 +0000 (16:46 -0400)
1  2 
gnu/local.mk

diff --cc gnu/local.mk
Simple merge