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

[takaki at users.alioth.debian.org]

Build-Depend on libjack-dev only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f9f56fb2819a6fa137657537d598dae3caef9f12
X-Git-Newrev: 6e266c9f8110e621e4c8116de9f6121a0da8da50

The following commit has been merged in the master branch:
commit 6e266c9f8110e621e4c8116de9f6121a0da8da50
Merge: 9caa7ad0ce0c0985d3309405e3411a33ecc63492 f9f56fb2819a6fa137657537d598dae3caef9f12
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Mon May 16 23:33:32 2011 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/clam-networkeditor
    
    Conflicts:
    	debian/control


-- 
clam-networkeditor packaging