[dtd-parser] 01/01: Merge branch 'upstream'

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to branch master
in repository dtd-parser.

commit 7d2b5b5de9e6bb1e76de1a7db5505c892646a4cb
Merge: 900d11b 6c4bd15
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Jan 17 12:19:34 2014 +0200

    Merge branch 'upstream'


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