[Pkg-privacy-commits] [mat] 09/22: Merge commit 'debian/mat_0.1-1_4.gbp70ebf7' 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 0e79582022dacec998f05a82b9b3f848ca0c5a06
Merge: 48c2400 bdc2b36
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Oct 31 14:37:32 2011 +0100

    Merge commit 'debian/mat_0.1-1_4.gbp70ebf7' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 debian/README.Debian |  5 +++--
 debian/changelog     | 14 ++++----------
 debian/control       |  9 ++++-----
 debian/watch         |  2 +-
 4 files changed, 12 insertions(+), 18 deletions(-)

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