git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e97e002 e4f1dd6)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 16 Jan 2012 14:21:17 +0000 (15:21 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 16 Jan 2012 14:21:17 +0000 (15:21 +0100)

Trivial merge
sfa