Merge remote-tracking branch 'origin/master' into flatdev
authormkrzewic <mikolaj.krzewicki@cern.ch>
Mon, 29 Sep 2014 09:49:08 +0000 (11:49 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Mon, 29 Sep 2014 09:49:08 +0000 (11:49 +0200)
Conflicts:
PWGCF/FEMTOSCOPY/ESE/AliAnalysisTaskFemtoESE.cxx


Trivial merge