git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f1cf45 be92c7e)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 15 Oct 2013 10:05:10 +0000 (12:05 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 15 Oct 2013 10:05:10 +0000 (12:05 +0200)

Trivial merge
sfa