Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 8 Oct 2012 11:10:04 +0000 (13:10 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 8 Oct 2012 11:10:04 +0000 (13:10 +0200)
commit7fcb8153bd74ce00f9f0d43c8aa090e0b70e345f
tree0278c84e43e427d97781bfe7b33a216859f72aa9
parentd58796f6bdf59cc669ac207daebe03a0ef9dab3b
parentf61e482c58689b56094da69f6367741d0fbf05b2
Merge branch 'upstreammaster'