git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55add1f 2c090a6)
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 18 Dec 2013 14:02:22 +0000 (15:02 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Wed, 18 Dec 2013 14:02:22 +0000 (15:02 +0100)

Trivial merge
sfa