]> Shamusworld >> Repos - ardour-manual-diverged/commitdiff
merge with master
authorJörn Nettingsmeier <nettings@stackingdwarves.net>
Tue, 11 Feb 2014 21:34:56 +0000 (22:34 +0100)
committerJörn Nettingsmeier <nettings@stackingdwarves.net>
Tue, 11 Feb 2014 21:34:56 +0000 (22:34 +0100)

Trivial merge