[Pkg-privacy-commits] [mat] 12/22: Merge branch 'master' 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 ac9ad711b5ce7cebebe57b4b1889159a3ad57b74
Merge: 27551ed 9f162df
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Dec 13 13:26:41 2011 +0100

    Merge branch 'master' into squeeze-backports
    
    Conflicts:
    	debian/changelog

 CHANGELOG        |  2 ++
 FORMATS          | 10 ++++----
 README           | 22 ++++++++--------
 RELEASE          |  8 ++++++
 TODO             | 12 +++++----
 debian/changelog | 29 +++++----------------
 debian/control   | 12 ++++++++-
 debian/rules     |  5 ++++
 mat-cli          | 12 +++++----
 mat-cli.1        |  4 +--
 mat-gui          | 41 ++++++++++++++++++++++++-----
 mat/exiftool.py  |  4 +--
 mat/mat.py       | 78 ++++++++++++++++++++------------------------------------
 mat/office.py    | 12 ++++-----
 mat/strippers.py | 48 ++++++++++++++++++++++++++++++++++
 setup.py         |  2 +-
 test/clitest.py  | 27 ++++++++++++++++++--
 test/libtest.py  | 17 +++++++++++-
 test/test.py     | 15 +++++++++--
 19 files changed, 239 insertions(+), 121 deletions(-)


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