Merge remote-tracking branch 'origin/master' into TPCdev
authormkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 11 Mar 2014 20:37:38 +0000 (21:37 +0100)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 11 Mar 2014 20:37:38 +0000 (21:37 +0100)
commit7477f38db6559b59cdf22685db6b560d3e738fff
treea357b16c8ca4b2b39084ae8e3c07f792fac997e9
parentcf0d27b071935285d69971d720c0cb7b5ced01e8
parentd337fb9ef5b09c9fbed81d488aaf13b59816f951
Merge remote-tracking branch 'origin/master' into TPCdev

Conflicts:
PWGCF/Correlations/macros/dptdptcorrelations/AddTaskDptQA.C
STEER/STEER/AliReconstruction.cxx
PWGHF/vertexingHF/AliAnalysisTaskSEHFQA.cxx
STEER/STEER/AliReconstruction.cxx