Merge branch 'flatdev' of https://git.cern.ch/reps/AliRoot into flatdev
authorsgweber <steffen.georg.weber@cern.ch>
Tue, 29 Jul 2014 14:06:46 +0000 (16:06 +0200)
committersgweber <steffen.georg.weber@cern.ch>
Tue, 29 Jul 2014 14:06:46 +0000 (16:06 +0200)

Trivial merge