Merge branch 'master', remote branch 'origin' into TPCdev
authormkrzewic <mikolaj.krzewicki@cern.ch>
Wed, 5 Feb 2014 16:26:20 +0000 (17:26 +0100)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Wed, 5 Feb 2014 16:26:20 +0000 (17:26 +0100)

Trivial merge