merge with master and fix 2 conflicts
[ardour.git] / libs / backends / jack / jack_session.cc
2013-10-17 Paul Davismerge with master and fix 2 conflicts
2013-10-08 Paul Davis-arestore jack timebase master and jack session callbac...