Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 9 Apr 2013 18:25:02 +0000 (14:25 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 9 Apr 2013 18:25:02 +0000 (14:25 -0400)
commit6592c8696ad5e8b479c3997639e7b54981ec06af
tree21b14ad96ecce8742969cbd2c0efb1c5ccc62aba
parent722d7f4de6b9c664b7bb9331e67a9f4869f4f9af
parent082de27a4e4b192e541c95cb90b97be67d5ed2d0
Merge branch 'master' of git.ardour.org:ardour/ardour