git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 667ee8a 0b3477f)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Jan 2013 16:46:29 +0000 (17:46 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Jan 2013 16:46:29 +0000 (17:46 +0100)

Trivial merge
sfa