[SCM] supercollider/master: Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/supercollider

[fsateler at users.alioth.debian.org]

Use system libyaml-cpp0.3 (fixes #722430)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5f4d0fb4ce4b15fac4c78bbc871f94ba9fbd9fb8
X-Git-Newrev: ef6a0a5db618fb51e485d6e63948c80fc446151b

The following commit has been merged in the master branch:
commit ef6a0a5db618fb51e485d6e63948c80fc446151b
Merge: d04ef042f483445bde28c99251b3d03c06d8c9ea 5f4d0fb4ce4b15fac4c78bbc871f94ba9fbd9fb8
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Sep 13 13:13:59 2013 -0300

    Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/supercollider
    
    Conflicts:
    	debian/rules


-- 
supercollider packaging