git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0425553 92ab25d)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 6 Mar 2012 21:47:28 +0000 (22:47 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 6 Mar 2012 21:47:28 +0000 (22:47 +0100)

Trivial merge
sfa