Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 25 Mar 2013 13:25:03 +0000 (09:25 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 25 Mar 2013 13:25:03 +0000 (09:25 -0400)
commitf9c7603bdb2cd9720c17146387b39c433d757327
treef21033baeb07c3286fe87d233be1d1edaa024198
parent936362abc20e1b813ba81955ae9251bdae8a07ad
parentfe29965980a9d84e4991f8eb3083084ca108ac08
Merge branch 'master' of git.ardour.org:ardour/ardour