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

[js at users.alioth.debian.org]

Update changelog, control file and copyright hints.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b632f482b959a6cdb4a50d4ecd069a82f7f500de
X-Git-Newrev: ea5f970f7cb0fde0885510ef3423219ce4b0b470

The following commit has been merged in the master branch:
commit ea5f970f7cb0fde0885510ef3423219ce4b0b470
Merge: 8bb8a019ee7586ccba1375cda3cc43ccb73304e1 b632f482b959a6cdb4a50d4ecd069a82f7f500de
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 5 20:46:44 2012 +0200

    Merge branch 'master' of git.debian.org:/git/pkg-multimedia/ices2
    
    Conflicts:
    	debian/changelog


-- 
ices2 packaging