[doxia-sitetools] 02/03: Merge branch 'upstream'

[Christopher Hoskin]

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

grinorcole-guest pushed a commit to branch master
in repository doxia-sitetools.

commit b5826e02a52bad90d644af28d4a63f9f1e9faa00
Merge: 62d562a 8b0b174
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Fri Nov 18 22:00:49 2016 +0000

    Merge branch 'upstream'


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