[SCM] toonloop/upstream: Merge branch 'upstream' of git.debian.org:/git/pkg-multimedia/toonloop into upstream

[js at users.alioth.debian.org]

Imported Upstream version 2.0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: 35cac530f0df4176b91f4030991842d0aa28d6c6
X-Git-Newrev: 4a79aabcc34a1cc14d452f1a2048368b021bbe0a

The following commit has been merged in the upstream branch:
commit 4a79aabcc34a1cc14d452f1a2048368b021bbe0a
Merge: 4f17c5d000766103c55effb640dd77855ea87fcc 35cac530f0df4176b91f4030991842d0aa28d6c6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jan 11 06:07:44 2011 +0100

    Merge branch 'upstream' of git.debian.org:/git/pkg-multimedia/toonloop into upstream


-- 
toonloop packaging