Merge branch 'master' into flatdev
authorhristov <Peter.Hristov@cern.ch>
Thu, 6 Nov 2014 11:41:43 +0000 (12:41 +0100)
committerhristov <Peter.Hristov@cern.ch>
Thu, 6 Nov 2014 11:41:43 +0000 (12:41 +0100)
Conflicts:
PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C


Trivial merge