From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 27 Nov 2013 21:19:01 +0000 (-0500)
Subject: Merge branch 'master' into cairocanvas
X-Git-Tag: 1.0.0~1045
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=680c64246e4ee9f3eb53da079dea6a7ecf996e92

Merge branch 'master' into cairocanvas
---

680c64246e4ee9f3eb53da079dea6a7ecf996e92