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)
commit7f1085c4d2b2f7a6b9652fdfc5ffcc4e638b3ebc
tree6b98d3140e3804badb1b14a97b1f5bc52991cbf9
parent0efde530d9a88db0dc9e13be66fcce7c8c1dc5c0
parent8eb5aae7f914c2fb8a2a75ca355dd5fb20f3dd20
Merge branch 'master' into flatdev

Conflicts:
PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C