Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Sun, 23 Nov 2014 00:23:18 +0000 (01:23 +0100)
committermivanov <marian.ivanov@cern.ch>
Sun, 23 Nov 2014 00:23:18 +0000 (01:23 +0100)
Conflicts:
TPC/Base/AliTPCCalROC.cxx


Trivial merge