Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 2 Jan 2013 12:36:52 +0000 (13:36 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 2 Jan 2013 12:36:52 +0000 (13:36 +0100)
commit667ee8a8989f8bba94827c4e9d3ea86b168a7e92
tree5783fe8563fe14664ed1137e9a0e9489a49e8ae9
parentf56515411fd74aaa036cd1c7138da353e7fb7712
parente2ebcb974152700c178d9808f1570817fbc15acf
Merge branch 'upstreammaster'