git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b2452e 7766ddd)
Merge branch 'upstreammaster'
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 29 Oct 2012 08:02:54 +0000 (09:02 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 29 Oct 2012 08:02:54 +0000 (09:02 +0100)

Trivial merge
sfa