[SCM] ardour3/master: Merge tag 'upstream/3.5.308_dfsg'

[adiknoth-guest at users.alioth.debian.org]

Imported Upstream version 3.5.308~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c29a559faf69e0cd707ed2a58fd7339ed8df17cf
X-Git-Newrev: d0e6375a4f4526de28d7da5a40282d28d0b8de63

The following commit has been merged in the master branch:
commit 5bfc2a9ca0fbab0a9732a49b806b44e55cdff822
Merge: c29a559faf69e0cd707ed2a58fd7339ed8df17cf c9821223b8a500a4e2341bc00bd2d6d72351bc39
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Jan 24 11:56:43 2014 +0100

    Merge tag 'upstream/3.5.308_dfsg'
    
    Upstream version 3.5.308~dfsg


-- 
ardour3 packaging