git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d5dfbe 29d20bb)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 8 Dec 2011 15:37:39 +0000 (16:37 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 8 Dec 2011 15:37:39 +0000 (16:37 +0100)

Trivial merge
sfa