git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a2f302 172dad4)
Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 30 Nov 2012 08:24:53 +0000 (09:24 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 30 Nov 2012 08:24:53 +0000 (09:24 +0100)

Trivial merge
sfa