[Pkg-privacy-commits] [mat] 17/22: Merge commit 'debian/mat_0.2.2-1' 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 fe483498674fe079e6d86d5f719b983c66622a58
Merge: 763b943 a90e694
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Dec 29 18:46:15 2011 +0100

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

 CHANGELOG        | 10 ++++++++++
 FORMATS          |  1 +
 README           | 11 +++++++++--
 RELEASE          |  8 +++++++-
 TODO             |  3 +++
 debian/changelog | 12 ++++++------
 mat-cli          |  4 +++-
 mat-cli.1        |  2 +-
 mat-gui          |  3 ++-
 mat/mat.py       |  2 +-
 test/clitest.py  | 10 ++++++++--
 test/libtest.py  | 10 ++++++++--
 test/test.py     | 20 +++++++++++++++++++-
 13 files changed, 78 insertions(+), 18 deletions(-)

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