From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 29 Jan 2014 21:08:52 +0000 (-0500)
Subject: Merge branch 'master' into cairocanvas
X-Git-Tag: 1.0.0~856
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=2ba58dfe65bb0c5ba7d5eb18a1566fa79eeb6993;p=ardour.git

Merge branch 'master' into cairocanvas
---

2ba58dfe65bb0c5ba7d5eb18a1566fa79eeb6993