From: Ed Ward <edwsaintesprit@hotmail.com>
Date: Thu, 12 Jan 2017 19:32:56 +0000 (+0100)
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=a5067cad71228c443fdedf4263fc7cf41d9d6b67

Merge branch 'master' of shamusworld.gotdns.org/git/ardour-manual
---

a5067cad71228c443fdedf4263fc7cf41d9d6b67