Updated branch aliroot-master, development and master to
authorMatthias Richter <Matthias.Richter@cern.ch>
Tue, 7 Oct 2014 17:38:40 +0000 (19:38 +0200)
committerMatthias Richter <Matthias.Richter@cern.ch>
Tue, 7 Oct 2014 17:38:40 +0000 (19:38 +0200)
commit a03e68ec0fc63b8ab6704eba33e48378f985637a
Author: policheh <Boris.Polishchuk@cern.ch>
Date:   Tue Oct 7 19:32:38 2014 +0400


Trivial merge