Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorfbock <friederike.bock@cern.ch>
Sat, 29 Nov 2014 12:42:47 +0000 (13:42 +0100)
committerfbock <friederike.bock@cern.ch>
Sat, 29 Nov 2014 12:42:47 +0000 (13:42 +0100)

Trivial merge