git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc606b4 7c4cd30)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 18 Nov 2011 09:54:08 +0000 (10:54 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 18 Nov 2011 09:54:08 +0000 (10:54 +0100)

Trivial merge
sfa