git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e39e728 89d0fa4)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 6 Nov 2011 20:05:12 +0000 (21:05 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 6 Nov 2011 20:05:12 +0000 (21:05 +0100)

Trivial merge
sfa