git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d41479 8357e20)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 16 Dec 2011 14:09:29 +0000 (15:09 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 16 Dec 2011 14:09:29 +0000 (15:09 +0100)

Trivial merge
sfa