From: CROCHET Philippe <crochet@clermont.in2p3.fr>
Date: Fri, 10 Jan 2014 09:52:14 +0000 (+0100)
Subject: Merge branches 'Laurent_12012014' and 'master'
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=fb41596817a5b8d87cd303f7a71ff599ca2fd80d

Merge branches 'Laurent_12012014' and 'master'
---