git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9887cc9 ad6f3a3)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 6 Oct 2010 07:56:02 +0000 (09:56 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 6 Oct 2010 07:56:02 +0000 (09:56 +0200)

Trivial merge
sfa