[epubcheck] 02/03: Merge branch 'upstream'

[Eugene Zhukov]

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

eugene-guest pushed a commit to branch master
in repository epubcheck.

commit a35c702c00990500cd00b35ea4904d54a1031719
Merge: 273fd29 2da8a56
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Wed Sep 2 06:45:50 2015 +0000

    Merge branch 'upstream'

 .gitattributes            |  15 ++++++
 .gitignore                |  41 ++++++++++++++++
 .travis.yml               |  15 ++++++
 .travis/after_success.sh  |   7 +++
 .travis/before_install.sh |   4 ++
 .travis/settings.xml      | 116 ++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 198 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/epubcheck.git