Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 21 Oct 2014 11:58:27 +0000 (13:58 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 21 Oct 2014 11:58:27 +0000 (13:58 +0200)

Trivial merge