Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 13 Mar 2013 18:25:52 +0000 (14:25 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 13 Mar 2013 18:25:52 +0000 (14:25 -0400)
commit6f0291beffb877c5c23c4d49b1bb39791f7ba62c
treeb3c5e267d1282c54026f0685c76f680a1c18985e
parentd3fdce3726bd7e6b7bb32cd639ac8884f22c6a97
parentd957bf7a28bf5e762fbabf08640043aa065b57c5
Merge branch 'master' of git.ardour.org:ardour/ardour