Merge remote-tracking branch 'origin/master' into flatdev
authormkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 20 May 2014 23:14:11 +0000 (01:14 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 20 May 2014 23:14:11 +0000 (01:14 +0200)

Trivial merge