Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 2 Apr 2013 20:11:04 +0000 (16:11 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 2 Apr 2013 20:11:04 +0000 (16:11 -0400)
commit1d8bac08c0c00d44e22c581768a275e1b21a99a7
treef3f19460898e8dd0f6eb6d9a37591e2d4138d2fe
parent04cba6eca0acd5bc1d264f52e68eb960abe7ef50
parente06ff1cf295f72ee2e33ac8af2b4ec3d59e652aa
Merge branch 'master' of git.ardour.org:ardour/ardour