[r-cran-colorspace] 24/25: Merge branch 'upstream'

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository r-cran-colorspace.

commit b0e1688514bc550fb22e0dc723ece809b1fc2c35
Merge: 7b1d312 086aeae
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Nov 15 12:46:59 2017 +0100

    Merge branch 'upstream'


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-colorspace.git