git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf802a4 e2ff966)
Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 21 Sep 2012 16:48:32 +0000 (18:48 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 21 Sep 2012 16:48:32 +0000 (18:48 +0200)

Trivial merge
sfa