Merge big changes (mostly Controllable) from trunk
[ardour.git] / LAST_MERGE
1 Last merged with trunk revision: 627