Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormaszyman <maszyman@cern.ch>
Mon, 9 Dec 2013 11:27:32 +0000 (12:27 +0100)
committermaszyman <maszyman@cern.ch>
Mon, 9 Dec 2013 11:27:32 +0000 (12:27 +0100)

Trivial merge