Merge branch 'MyDevBranch'
authorzampolli <Chiara.Zampolli@cern.ch>
Sat, 22 Nov 2014 17:45:16 +0000 (18:45 +0100)
committerzampolli <Chiara.Zampolli@cern.ch>
Sat, 22 Nov 2014 17:45:16 +0000 (18:45 +0100)

Trivial merge