git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45875d9 f6f1bf8)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 7 Sep 2011 13:45:02 +0000 (15:45 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 7 Sep 2011 13:45:02 +0000 (15:45 +0200)

Trivial merge
sfa