git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 845abc0 3647d2a)
Merge branches 'master' and 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 18 Nov 2011 08:55:44 +0000 (09:55 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 18 Nov 2011 08:55:44 +0000 (09:55 +0100)

Trivial merge
sfa