git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7568cd 2ae9d8f)
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 16 Dec 2013 12:57:14 +0000 (13:57 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 16 Dec 2013 12:57:14 +0000 (13:57 +0100)

Trivial merge
sfa