git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69fb221 52c5ae5)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 17 Nov 2011 10:32:17 +0000 (11:32 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 17 Nov 2011 10:32:17 +0000 (11:32 +0100)

Trivial merge
sfa