merge with master, including manual merge conflict resolution
[ardour.git] / foo
2013-03-13 Paul Davismessing around with hooks