git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8d584c bd6285e)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 30 Aug 2012 10:13:20 +0000 (12:13 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 30 Aug 2012 10:13:20 +0000 (12:13 +0200)

Trivial merge
sfa