Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 14 Oct 2014 14:14:40 +0000 (16:14 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 14 Oct 2014 14:14:40 +0000 (16:14 +0200)

Trivial merge