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

[Lifeng Sun]

The following commit has been merged in the master branch:
commit e4ccd49e18ef14373a33f6138014253e99c32ae4
Merge: 4502d5c77a16414f284f868f1148b58dd712d4ac c417108ce4746d1a63404810cf0200dec7bee487
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Aug 20 21:10:04 2012 +0800

    Merge tag 'upstream/2.1.2.5'
    
    Upstream version 2.1.2.5


-- 
CLHEP: A Class Library for High Energy Physics