Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Sat, 28 Jun 2014 06:03:52 +0000 (08:03 +0200)
committermivanov <marian.ivanov@cern.ch>
Sat, 28 Jun 2014 06:03:52 +0000 (08:03 +0200)

Trivial merge