[SCM] CLHEP: A Class Library for High Energy Physics branch, master, updated. upstream/2.1.2.5-18-gfa6d367

[Lifeng Sun]

The following commit has been merged in the master branch:
commit fa6d367163294cefd192b0238608e0aed2e87efb
Merge: b3dc61b7163583e585718fa74d77e39e1a5a7487 c2569aed6936bccbf2a05b5ddd1de0f127d25db3
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Oct 15 19:24:08 2012 +0800

    Merge tag 'upstream/2.1.2.5'
    
    Upstream version 2.1.2.5


-- 
CLHEP: A Class Library for High Energy Physics