Merge branch 'version-0.15.0'
authorLudovic Courtès <ludo@gnu.org>
Fri, 6 Jul 2018 15:42:25 +0000 (17:42 +0200)
committerLudovic Courtès <ludo@gnu.org>
Fri, 6 Jul 2018 15:42:25 +0000 (17:42 +0200)
1  2 
doc/guix.texi

diff --cc doc/guix.texi
Simple merge