git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a18309f 1a4dde3)
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorSaint-Marcel Frederic <frederic.saint-marcel@inria.fr>
Fri, 17 Jan 2014 15:14:22 +0000 (16:14 +0100)
committerSaint-Marcel Frederic <frederic.saint-marcel@inria.fr>
Fri, 17 Jan 2014 15:14:22 +0000 (16:14 +0100)

Trivial merge
sfa