Merge branch 'master' into exp2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 20 Oct 2011 13:48:54 +0000 (15:48 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 20 Oct 2011 13:48:54 +0000 (15:48 +0200)
commitdb88e8be755e4a4c17fcd65eec98ca420eff91a4
tree11a81bfd125ef28c0ecefeaba8be07e1aec0df8b
parentc6f47ceb75c2903f6b8fddcd135c1329bea81d99
parent639933e0422a2414426caac1384a56c9bed6993f
Merge branch 'master' into exp2