Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorjniedzie <jeremi.niedziela@cern.ch>
Wed, 9 Jul 2014 09:34:20 +0000 (11:34 +0200)
committerjniedzie <jeremi.niedziela@cern.ch>
Wed, 9 Jul 2014 09:34:20 +0000 (11:34 +0200)

Trivial merge