Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormkrzewic <mikolaj.krzewicki@cern.ch>
Mon, 26 May 2014 19:00:04 +0000 (21:00 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Mon, 26 May 2014 19:00:04 +0000 (21:00 +0200)

Trivial merge