git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2779895 68f0f5b)
Merge branch 'master' into senslab2
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 8 Nov 2011 00:12:32 +0000 (01:12 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 8 Nov 2011 00:12:32 +0000 (01:12 +0100)

Trivial merge
sfa