Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 30 Mar 2013 18:02:38 +0000 (14:02 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 30 Mar 2013 18:02:38 +0000 (14:02 -0400)
commit236360d8ffab9f095fcda9e09b159b2a47feb6af
tree28213beeb3945a7a86278b9a8f878733207019e1
parentb691d4bf04b46059c09e144e34fc58504926ef06
parentdeaceb4727effced797ecac67fa55e5eef75b003
Merge branch 'master' of git.ardour.org:ardour/ardour