Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Sat, 22 Nov 2014 20:03:10 +0000 (21:03 +0100)
committermivanov <marian.ivanov@cern.ch>
Sat, 22 Nov 2014 20:03:10 +0000 (21:03 +0100)

Trivial merge