git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b0d862 cccd9d9)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 28 Mar 2011 09:01:11 +0000 (11:01 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 28 Mar 2011 09:01:11 +0000 (11:01 +0200)

Trivial merge
sfa