Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
authorJohn Emmas <johne53@tiscali.co.uk>
Tue, 6 Aug 2013 14:18:27 +0000 (15:18 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Tue, 6 Aug 2013 14:18:27 +0000 (15:18 +0100)

Trivial merge