Merge branch 'master' into TPCdev
authorhristov <Peter.Hristov@cern.ch>
Wed, 28 May 2014 08:58:24 +0000 (10:58 +0200)
committerhristov <Peter.Hristov@cern.ch>
Wed, 28 May 2014 08:58:24 +0000 (10:58 +0200)

Trivial merge