From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 3 Sep 2013 12:50:38 +0000 (-0400)
Subject: Merge branch 'master' into windows
X-Git-Tag: 1.0.0~868^2~83^2
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=a6e0b60ae1df3676ba45eeb302108eecfe7a7797

Merge branch 'master' into windows
---

a6e0b60ae1df3676ba45eeb302108eecfe7a7797