git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c900832 2a0adf2)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 24 Apr 2012 16:51:51 +0000 (18:51 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 24 Apr 2012 16:51:51 +0000 (18:51 +0200)

Trivial merge
sfa