[Python-modules-commits] [python-exif] 01/01: Merge remote-tracking branch 'upstream/master'

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository python-exif.

commit c504d52f2c6de5c09d6818144699c5e32f80d062
Merge: 2285df8 6ff9ed1
Author: W. Martin Borgert <debacle at debian.org>
Date:   Tue Oct 7 00:25:56 2014 +0200

    Merge remote-tracking branch 'upstream/master'
    
    Conflicts:
    	EXIF.py

 .gitattributes                   |   11 +
 .gitignore                       |   48 +
 CHANGES.txt                      |  162 ++++
 EXIF.py                          | 1825 +++-----------------------------------
 LICENSE.txt                      |   31 +
 MANIFEST.in                      |    1 +
 README.rst                       |  128 +++
 __init__.py                      |    1 +
 exifread/__init__.py             |  228 +++++
 exifread/classes.py              |  511 +++++++++++
 exifread/tags/__init__.py        |   28 +
 exifread/tags/exif.py            |  360 ++++++++
 exifread/tags/makernote.py       |  618 +++++++++++++
 exifread/tags/makernote_canon.py |  417 +++++++++
 exifread/utils.py                |   76 ++
 setup.py                         |   33 +
 16 files changed, 2753 insertions(+), 1725 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-exif.git