Merge branch 'minsec-ruler-display' of https://github.com/djpohly/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 14 May 2014 13:04:24 +0000 (09:04 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 14 May 2014 13:04:24 +0000 (09:04 -0400)

Trivial merge