Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 19 Mar 2013 14:25:31 +0000 (10:25 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 19 Mar 2013 14:25:31 +0000 (10:25 -0400)
commitc71e38101952a56c17d1e9031cf69be9cd420976
tree4747c6e208265f21e1540c4dd91e52b25edc58c0
parent719818b56999d0ce5daf18c59bc26df2caa4ed5d
parente1f3dcee2a7a8233b6f3306763a7e7bce787bb4c
Merge branch 'master' of git.ardour.org:ardour/ardour