git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d9943d 63afad2)
Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 08:34:44 +0000 (10:34 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 08:34:44 +0000 (10:34 +0200)

Trivial merge
sfa