[clhep] 06/07: Merge branch 'upstream'

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository clhep.

commit 82ca8119b325331d3133e10b57aea737d5e3ab96
Merge: 26b7809 d7ef2fc
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Feb 7 11:43:42 2017 +0100

    Merge branch 'upstream'

 GenericFunctions/doc/psfig.sty | 995 -----------------------------------------
 1 file changed, 995 deletions(-)

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