From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 17 Oct 2013 02:06:56 +0000 (-0400)
Subject: merge with master and fix 2 conflicts
X-Git-Tag: 1.0.0~1087
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=e5888d398350b26ba2cdc634cc9791e90b4fc6b6;hp=e5888d398350b26ba2cdc634cc9791e90b4fc6b6;p=ardour.git

merge with master and fix 2 conflicts
---