Merge remote-tracking branch 'origin/master' into flatdev
authormkrzewic <mikolaj.krzewicki@cern.ch>
Mon, 29 Sep 2014 11:26:34 +0000 (13:26 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Mon, 29 Sep 2014 11:26:34 +0000 (13:26 +0200)

Trivial merge