From: Shamus Hammons Date: Thu, 12 Jan 2017 19:12:18 +0000 (-0600) Subject: Merge branch 'master' of http://shamusworld.gotdns.org/git/ardour-manual X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=ardour-manual-diverged;a=commitdiff_plain;h=9d9e4988fe140a7798906887d04cd7b7ca5a690a Merge branch 'master' of shamusworld.gotdns.org/git/ardour-manual --- 9d9e4988fe140a7798906887d04cd7b7ca5a690a