git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45e7d08 bc38139)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 29 Jun 2012 08:59:49 +0000 (10:59 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 29 Jun 2012 08:59:49 +0000 (10:59 +0200)

Trivial merge
sfa