[Pkg-privacy-commits] [mat] 19/22: Merge commit 'debian/mat_0.2.2-2' into squeeze-backports

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch squeeze-backports
in repository mat.

commit 76cc3def77ee6946a180746477a70cd2c378d54d
Merge: 7c121a7 d5ac180
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Jan 25 17:11:29 2012 +0100

    Merge commit 'debian/mat_0.2.2-2' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   | 10 ++++------
 ...01-Fix-a-critical-bug-thanks-to-omaylorga.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 27 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/mat.git