Merge branch 'pt-5-7-x' of https://github.com/zamaudio/ardour
authorRobin Gareus <robin@gareus.org>
Sat, 8 Aug 2015 15:49:05 +0000 (17:49 +0200)
committerRobin Gareus <robin@gareus.org>
Sat, 8 Aug 2015 15:49:05 +0000 (17:49 +0200)

Trivial merge