Merge branch 'master' of http://git.cern.ch/pub/AliRoot
authorrbailhac <Raphaelle.Bailhache@cern.ch>
Mon, 10 Nov 2014 14:42:13 +0000 (15:42 +0100)
committerrbailhac <Raphaelle.Bailhache@cern.ch>
Mon, 10 Nov 2014 14:42:13 +0000 (15:42 +0100)

Trivial merge