git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c0e994 326dac0)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 21 Nov 2011 13:22:47 +0000 (14:22 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 21 Nov 2011 13:22:47 +0000 (14:22 +0100)

Trivial merge
sfa