git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 904c314 5aedc35)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 30 Nov 2011 20:34:02 +0000 (21:34 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 30 Nov 2011 20:34:02 +0000 (21:34 +0100)

Trivial merge
sfa