git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3c063a 4de5acd)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 16 Mar 2012 16:28:59 +0000 (09:28 -0700)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 16 Mar 2012 16:28:59 +0000 (09:28 -0700)

Trivial merge
sfa