Merge branch 'master' into flatdev
authorzampolli <Chiara.Zampolli@cern.ch>
Thu, 5 Jun 2014 09:14:20 +0000 (11:14 +0200)
committerzampolli <Chiara.Zampolli@cern.ch>
Thu, 5 Jun 2014 09:14:20 +0000 (11:14 +0200)

Trivial merge