Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormweber <physics@pb-d-128-141-49-189.cern.ch>
Tue, 10 Dec 2013 16:47:32 +0000 (17:47 +0100)
committermweber <physics@pb-d-128-141-49-189.cern.ch>
Tue, 10 Dec 2013 16:47:32 +0000 (17:47 +0100)
1  2 
PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h
TRD/AliTRDtrapConfig.h

Simple merge