Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorCarl Hetherington <cth@carlh.net>
Tue, 29 Apr 2014 11:42:49 +0000 (12:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 29 Apr 2014 11:42:49 +0000 (12:42 +0100)

Trivial merge