Merge branch 'feature-ALIROOT-5800'
authordberzano <dario.berzano@cern.ch>
Tue, 3 Feb 2015 19:07:47 +0000 (20:07 +0100)
committerdberzano <dario.berzano@cern.ch>
Tue, 3 Feb 2015 19:07:47 +0000 (20:07 +0100)

Trivial merge