git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5b3a59 3df87e6)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 10 Dec 2011 12:29:35 +0000 (13:29 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 10 Dec 2011 12:29:35 +0000 (13:29 +0100)

Trivial merge
sfa