git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8f8c136 28cc68b)
Merge branch 'upstreammaster'
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 29 Jan 2013 16:41:55 +0000 (17:41 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 29 Jan 2013 16:41:55 +0000 (17:41 +0100)

Trivial merge
sfa