Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 6 Nov 2011 20:05:12 +0000 (21:05 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 6 Nov 2011 20:05:12 +0000 (21:05 +0100)
commite98b602a586412b828057bcebf2b6073697720a5
tree8e2b071c08766d1bea736bab9cb08bf9992032c0
parente39e728991b762ae0b52b52b06655f0c7f1b7421
parent89d0fa4efde57cb62445af75c16bdc42bc03693a
Merge branch 'upstreammaster'