Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Apr 2013 19:23:01 +0000 (15:23 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 17 Apr 2013 19:23:01 +0000 (15:23 -0400)

Trivial merge