[SCM] clam/master: Merge branch 'nmu'

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

Imported Debian patch 1.4.0-5.2
Imported Debian patch 1.4.0-5.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c92ad258554b5de840130064e38ff99f80058662
X-Git-Newrev: 33072664360d2a9021b81b87620daba155549f45

The following commit has been merged in the master branch:
commit 48696b93de7392652498270198360e8dccc33cc3
Merge: c92ad258554b5de840130064e38ff99f80058662 d71a0cad310666f30bb98166e9953c910d39d776
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Fri Nov 21 15:46:10 2014 +0000

    Merge branch 'nmu'


-- 
clam packaging