git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 652859a 521a30a)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 9 Jan 2012 08:35:12 +0000 (09:35 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 9 Jan 2012 08:35:12 +0000 (09:35 +0100)

Trivial merge
sfa