Merge branch 'hotfix'
authorguernane <guernane@lpsc.in2p3.fr>
Mon, 12 Jan 2015 17:29:19 +0000 (18:29 +0100)
committerguernane <guernane@lpsc.in2p3.fr>
Mon, 12 Jan 2015 17:29:19 +0000 (18:29 +0100)

Trivial merge