[SCM] mjpegtools/master: Merge tag 'upstream/2.1.0+debian'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.1.0+debian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: edbcaaa22594c2ab06c97d5b405783d187efa54d
X-Git-Newrev: 6c7ff5ddfd985cfef6906805e7f45e7f8e86ee71

The following commit has been merged in the master branch:
commit b14c780ce501e53a54ae7345ceb4dbd5dd602ec7
Merge: edbcaaa22594c2ab06c97d5b405783d187efa54d ca8fe3a2b78736d67a72a81a0291b565212f1704
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Oct 7 17:04:24 2013 +0100

    Merge tag 'upstream/2.1.0+debian'
    
    Upstream version 2.1.0+debian


-- 
mjpegtools packaging