Merge remote-tracking branch 'origin/master' into flatdev
authormkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 20 May 2014 13:26:59 +0000 (15:26 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 20 May 2014 13:26:59 +0000 (15:26 +0200)
this to include Timos rest of patches

1  2 
HLT/BASE/AliHLTDataTypes.h
HLT/global/AliHLTGlobalEsdConverterComponent.cxx

Simple merge