[Pkg-privacy-commits] [mat] 15/22: Merge commit 'debian/mat_0.2.1-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 e91d9f3ff657d6c36da0c0010f0dffd223e57dc8
Merge: 0e31350 e57b742
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Dec 24 17:59:15 2011 +0100

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

 CHANGELOG        |   7 ++++
 RELEASE          |   6 +++
 TODO             |   5 ++-
 debian/changelog |  12 +++---
 mat-cli          |  26 ++++++-------
 mat-gui          | 114 ++++++++++++++++++++++++++++---------------------------
 mat/archive.py   |  12 +++---
 mat/mat.py       |  12 +++---
 mat/office.py    |  19 +++++++---
 mat/parser.py    |   5 ++-
 test/libtest.py  |   3 +-
 11 files changed, 123 insertions(+), 98 deletions(-)

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