git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32fd3b5 54a7385)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 22 May 2012 14:38:01 +0000 (16:38 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 22 May 2012 14:38:01 +0000 (16:38 +0200)

Trivial merge
sfa