From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 16 Jan 2014 22:26:50 +0000 (-0500)
Subject: Merge branch 'master' into cairocanvas
X-Git-Tag: 1.0.0~884
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=2e27e21d3a09889311e18a8efe11abcaa6d9c8b3

Merge branch 'master' into cairocanvas
---

2e27e21d3a09889311e18a8efe11abcaa6d9c8b3