git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec3b659 1d4d898)
Merge branch 'geni-v2' and master
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 3 Sep 2012 12:12:27 +0000 (14:12 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 3 Sep 2012 12:12:27 +0000 (14:12 +0200)

Trivial merge
sfa