Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormkrzewic <mikolaj.krzewicki@cern.ch>
Sat, 18 Oct 2014 08:49:03 +0000 (10:49 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Sat, 18 Oct 2014 08:49:03 +0000 (10:49 +0200)

Trivial merge